diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2019-05-20 16:08:17 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-20 16:08:17 -0700 |
| commit | edab4b06ffee1b35e13f71c8edb631681f449012 (patch) | |
| tree | 96faa63309ffedff71e5a43946f8ddde548b4cca /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2060d1f9f8d43976061a07b455ea65d7e44fe32b (diff) | |
| parent | 81c7d72c5b5bb42cfdf30c2f20b39064567f9ff6 (diff) | |
[automerger skipped] Merge "Add a factoryReset method to IIpMemoryStore, and freeze api." into qt-dev am: 39af041253 -s ours am: cbcc67feef -s ours
am: 81c7d72c5b -s ours
am skip reason: change_id Ia11ecd33f528d01667b1baeb8671b7213a31eef5 with SHA1 42ea026ae7 is in history
Change-Id: I52dc9715d47f5dae5164639235338737ea3138ee
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions