diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2019-05-20 15:52:33 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-20 15:52:33 -0700 |
| commit | 0bcb4875ec2665cd9b9e8c84c3bae1e2e806da0e (patch) | |
| tree | 084321f58b53a28e00955bffec297ecb729a41cb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d059240c5dd9b9cbe7ad6d809b7888c935512d70 (diff) | |
| parent | 8bdf921745f7b202cecf9e1e4b82ba1d9830f6d2 (diff) | |
[automerger skipped] Merge "Add a factoryReset method to IIpMemoryStore, and freeze api." into qt-dev am: 39af041253 am: 4683870195 -s ours
am: 8bdf921745 -s ours
am skip reason: change_id Ia11ecd33f528d01667b1baeb8671b7213a31eef5 with SHA1 91dd063172 is in history
Change-Id: I12fee95be578586d3e0f1810f629827d57cc5c36
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions