diff options
| author | Eugene Susla <eugenesusla@google.com> | 2019-06-28 22:04:38 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-28 22:04:38 -0700 |
| commit | 4be945e55a34f66016b618e630ecd5d4dc2f1ae1 (patch) | |
| tree | a93bf849c2f5c22cee6b3cd763b2590f6adec174 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5f165b619f60485396663aee60da8afaf3d009a2 (diff) | |
| parent | 2d4b42712175f3fbbac7264f351589c758ccfd15 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request am: 8c2fb0ea1e am: 2f10595d74" into qt-r1-dev-plus-aosp
am: 2d4b427121 -s ours
am skip reason: subject contains skip directive
Change-Id: I9a75660a101e30a5f03abd410c36a2b83c9a630b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions