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