diff options
| author | Artem Iglikov <artikz@google.com> | 2018-04-23 13:02:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-23 13:02:26 -0700 |
| commit | 6f3f0a3132179ffdd47e08b28877a88e9917c49f (patch) | |
| tree | a602b7b7c2471b47ecd563fd43d7f839f2e32aa8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a1668764b56afeabcdf8e8cd3e37de0a1377cbbc (diff) | |
| parent | f17d6e3010bd9b5a8d2c9acc62b58461ad1bc3e3 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Add list of approved services in addApprovedList" into pi-dev am: 7f352dbeaf
am: f17d6e3010 -s ours
Change-Id: I16f1ac17063fefe9d25d0442704880e2090a9aa5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions