diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2019-05-20 10:04:36 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-20 10:04:36 -0700 |
| commit | 81c7d72c5b5bb42cfdf30c2f20b39064567f9ff6 (patch) | |
| tree | 14eaec1f36f0ea8bfdd2f581f4c4a835d84e7c9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 061a2282fa2abdf62763893287e3f994a6464845 (diff) | |
| parent | cbcc67feef4b3c22ee5870666118e01975f9bdbb (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 skip reason: change_id Ia11ecd33f528d01667b1baeb8671b7213a31eef5 with SHA1 42ea026ae7 is in history
Change-Id: If9b2b45a37325b950a133645c8a1f7a3595fd14f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions