summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-06-16 23:03:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-16 23:03:34 +0000
commitb5e0a5bec36da7744f61b10db50617569ae885c5 (patch)
tree5cbb88cd365034fb007da536ef06e741420b9aa4 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf202c1c56eaf25721dab4ecf0617253239391c75 (diff)
parentdb4175a50d523a904f452459ae3aa9e796057ce0 (diff)
Merge "DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am: 79613777df -s ours am: cf82b09998 -s ours am: 2c3ca52a91 -s ours am: 24a5477e03 -s ours" into oc-dr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions