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