diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-17 19:57:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 19:57:43 +0000 |
| commit | f1b0c671e85d7ad5e1aa94d16336cda57158cd33 (patch) | |
| tree | 8ecb4783b410e7452aa286983155d6b5b3dbeb8c /cmds | |
| parent | bf1e36e8b7a6e08e2f20dd0b2900dda259c23459 (diff) | |
| parent | 2716969d2b88e85a6ed5a766b54a0a34dc137118 (diff) | |
| download | frameworks_av-f1b0c671e85d7ad5e1aa94d16336cda57158cd33.zip frameworks_av-f1b0c671e85d7ad5e1aa94d16336cda57158cd33.tar.gz frameworks_av-f1b0c671e85d7ad5e1aa94d16336cda57158cd33.tar.bz2 | |
am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-master
* commit '2716969d2b88e85a6ed5a766b54a0a34dc137118':
libcutils no longer requires that its users configure ANDROID_SMP.
Diffstat (limited to 'cmds')
0 files changed, 0 insertions, 0 deletions