diff options
| author | Marco Nelissen <marcone@google.com> | 2017-06-16 18:14:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-16 18:14:49 +0000 |
| commit | cdd378dbc90a5897e56298147fdcdf696e975c9e (patch) | |
| tree | 6053ce1b50f4eaeef3acba6d9d992e068c4ea137 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1db93a77494dfdfd01dc6b69b5e2ef19de42873b (diff) | |
| parent | b06a2dd54fd5f13f3ac124a72306f95913696aba (diff) | |
Merge "libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb -s ours am: 49fc959be3 -s ours am: 23118a9b77 -s ours am: 45cd809caa -s ours am: ce4c7df6a0 -s ours am: 035e2a5c37 -s ours am: 4e5ed845c7 -s ours am: 3cd244e872 -s ours am: a9bf75f50c -s ours am: 21caf4aee4 -s ours am: 009b3c6aec -s ours am: acbd7ba4aa -s ours am: 9454abb0ac -s ours" into oc-dr1-dev-plus-aosp
am: b06a2dd54f -s ours
Change-Id: Id8d7d04408aeba3536c6daa62e8f8b13aec01b6c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions