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