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