summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-15 21:54:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-15 21:54:40 +0000
commitc6a61b2e7da8e58077902152e1b9babbd1de21c2 (patch)
tree7ce87df92b3f0e6e3caeed2d9270635117849c09 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent23f165fb4f88b712c64366bc900b41e48f42aa77 (diff)
parenteb9ee8d3897d165b999cba6e81a4207ef3eefbed (diff)
Merge "Merge "Update media resourceManagerService with the Application pid" into rvc-dev am: cea1d98cde am: 622f9f44d4" into rvc-d1-dev-plus-aosp am: e5dd7e1a29 am: eb9ee8d389
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11803042 Change-Id: I76ae55e8e23c6bfca623762eae2ba36023b6d194
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions