diff options
| author | Kris Giesing <kgiesing@google.com> | 2015-04-22 17:51:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-22 17:51:18 +0000 |
| commit | 1aa5fb9619f490f4edeffb64f45e5395d8564103 (patch) | |
| tree | 1b9b84448aa0247856f56c6dcc232c03f660c11c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d5166504954f4e26845d26a9410cd798657a12d5 (diff) | |
| parent | 6ea4f9361e644e371c2f49454d2832c451648ebd (diff) | |
am 6ea4f936: (-s ours) am 0ab9655a: (-s ours) Merge "DO NOT MERGE Revert "Load libraries directly from apk"" into lmp-mr1-ub-docs
* commit '6ea4f9361e644e371c2f49454d2832c451648ebd':
DO NOT MERGE Revert "Load libraries directly from apk"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions