diff options
| author | Chen Xu <fionaxu@google.com> | 2019-06-05 11:27:37 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-05 11:27:37 -0700 |
| commit | 4a71793addedee73d76a363a009057cd0a50158d (patch) | |
| tree | 74a1e3f753078d16f710dedeeb8c4dcdb99d0e65 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | eaeaf5e18228392a76536df64b12badf4064ae63 (diff) | |
| parent | e499d9f43cc56dc719e0c490a1c93d3ca0708857 (diff) | |
[automerger skipped] Merge "Get the resources associated with subid to support MSIM" am: cdbb700fa3 am: 302b8e8cfe -s ours
am: e499d9f43c -s ours
am skip reason: change_id Ib00cfe3640b59db5f971c32741eed999131e67c0 with SHA1 ea6d2b1e1e is in history
Change-Id: I2971b0218b1ca82b63145fda3f9e08e718931e45
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions