diff options
| author | akirilov <akirilov@google.com> | 2018-09-05 19:20:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-09-05 19:20:26 -0700 |
| commit | d0ece65df5fb9abaaad897c8f6abbf366f0db3d9 (patch) | |
| tree | bd2b9d9dbe13e08c4fd54198da2a321e4eec50e6 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | a85a275221b3301eddbce847559a3e327412db93 (diff) | |
| parent | 2c148c58a632a7f4828e4bbdc547b593b746f937 (diff) | |
Merge "[automerger skipped] [automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342 am: ee4a2aee83 skipped: 879ecd17ab am: 47a4d99c0c am: 15682d0bd4 am: 4c0878bf74 -s ours am: 02fff3e2eb" into pi-dev-plus-aosp
am: 2c148c58a6 -s ours
Change-Id: I43a4f86c8fbf94a8130d11e5c826e9657ff03d7e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions