diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-08 02:48:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-08 02:48:48 +0000 |
| commit | f25f734a9952171f79fba2c4a69f042f92c93a10 (patch) | |
| tree | 2463507de6e4c5487e22dea77df11205b9e10c17 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6a5023849707b8cc7b56c6e9eaa91fc6e98c76c4 (diff) | |
| parent | 359b4e72510d9d3cdb001e6c72d2b0292e3d57cb (diff) | |
Merge changes from topic "am-54fac689a6aa4d21bf168f216f14d724" into rvc-dev-plus-aosp
* changes:
[automerger skipped] Merge changes from topic "no_staticlinking_to_stubs" am: 1bd72c839f am: 8b64bcf3fa -s ours
[automerger skipped] Make libstatssocket shared am: 3944f2d907 am: 79d2061804 -s ours
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions