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-09 04:21:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-09 04:21:53 +0000
commit7d17b0e6cbeedef1275913973e5efdd2385486bc (patch)
tree97b189b0512ac468302abbd6ff4b5c8e3652efc7 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent04702be981e09328bccc6c97a2ff58184533dae4 (diff)
parent0182b831198091607d72ab968d125654cdcf9960 (diff)
Merge "Merge "Move HapticSettingObserver to companion object." into rvc-dev am: f6795b105f am: 0c8600f39a" into rvc-d1-dev-plus-aosp am: 0182b83119
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11760917 Change-Id: Id405fb670efbf8ce029379a93791c09068e339f9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions