summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-16 00:43:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-16 00:43:16 +0000
commite823f9ea26fe1a97267570032fd84d8cd876ac8c (patch)
tree2d0f0ec1b71f11aca1f5ce9293e4247bce8bde20 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent314e4f73d8ddea692b6ac54a69a8bbad6f0c809b (diff)
parent74e71e1b3ad81b1573398a9fa6ee817b81eb9733 (diff)
Merge "Merge \\"Fix VR transition for display on/off sequence.\\" into nyc-dev am: 931a7c03e0 am: 336a7cb9b5" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions