diff options
| author | Elliott Hughes <enh@google.com> | 2015-08-12 23:56:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-12 23:56:18 +0000 |
| commit | 4c807349bdd46ff818edfed63e9193a1a5b67a9f (patch) | |
| tree | b5ed3585d03489a7ebd27dcfbb1c0efb9b9fa2d4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8cf6d865cfb3c05034f947b81de8ca09a92037a0 (diff) | |
| parent | 344d347af22705aa2fa80602d27a5682a72b5f69 (diff) | |
am 344d347a: am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."
* commit '344d347af22705aa2fa80602d27a5682a72b5f69':
Lose HAVE_ANDROID_OS from frameworks/base.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions