summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBeth Thibodeau <ethibodeau@google.com>2020-06-12 01:24:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-12 01:24:19 +0000
commit42d7447d486a2a4b410296181cc8bd02f6587a30 (patch)
treea2d31cb73d0a06ddb09ae59ca40fbcbcc8800c77 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent713caf07ee1f1f0fb52b2bb7e95ef22502bbe1e7 (diff)
parent46580d2c83898ea8c5b9445e0fdc074564628fbb (diff)
Merge "Reset media controls when user changes" into rvc-dev am: 4e86ccd2e6 am: ba9d30d6e0 am: 46580d2c83
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813680 Change-Id: I6fcd9d266cc27be1d22105732abb9bb763d06c1b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions