| commit | 9a5d9aa70ec8a4abf3eaabc2440d443c59b3e42e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 10:49:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:49:45 2015 +0000 |
| tree | 31930a291c99fe616059e735ef57023eff11a9c7 | |
| parent | bc8c55ed6782227adf0bc53913d3b3729312ee12 [diff] | |
| parent | 84988c8e092b081298e3f5b8bf5edb8b6ded4193 [diff] |
am 84988c8e: (-s ours) am 82c9b06a: am 6aa68725: Merge "Lose HAVE_ANDROID_OS from frameworks/compile/libbcc." * commit '84988c8e092b081298e3f5b8bf5edb8b6ded4193':