| commit | d1bba9da5143d5e398084b8c6bf5189b780734ab | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 05:12:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:12:59 2015 +0000 |
| tree | f07b202ea380fb956bc11373d8993a1015b55f60 | |
| parent | e21a347e9b905764c79338de31b990d131a8c62d [diff] | |
| parent | c6ada3b169827f581cd61749c6056c4209ebb650 [diff] |
am c6ada3b1: (-s ours) am 6a846dd5: am 5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native." * commit 'c6ada3b169827f581cd61749c6056c4209ebb650':