diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-04-12 13:17:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-12 13:17:50 +0000 |
| commit | 8049c118e7e69b701478d3f657e0e40b806c8b88 (patch) | |
| tree | 3deea21221533f21515915bb9176566ec8dcfcc3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ab706a26180259db69d0a3db8c2a74212b821b17 (diff) | |
| parent | cd87dc262d7643cf098dd8cc6675a5c94e1e07f7 (diff) | |
Merge changes from topic "am-878ea9668b274b6ba95050fbf51252cf" into qt-dev-plus-aosp
* changes:
Merge changes from topic "nnapi_ext_restrict" am: aef149ecde am: 52d97c1b5a
[automerger skipped] Add getLocationFlags getter to PackageManagerNative. am: 02d8a7c57d am: 1d03d08556 -s ours am skip reason: change_id I0b3a5a4f3559b2d1d44088c8fa1d5bb5605c83cb with SHA1 a4a631ea6f is in history
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions