| commit | a07bbaafcdb1a5467a601cc4c38a4d15c19010d7 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 21:42:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:42:47 2015 +0000 |
| tree | 46e38a8bafed8a10a35b52d1fc87cfd376225b4d | |
| parent | cb44b358c47032552f4518244e367350e13b8ee2 [diff] | |
| parent | d1bba9da5143d5e398084b8c6bf5189b780734ab [diff] |
am d1bba9da: am c6ada3b1: (-s ours) am 6a846dd5: am 5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native." * commit 'd1bba9da5143d5e398084b8c6bf5189b780734ab':