summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2016-06-16 01:04:26 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-16 01:04:26 +0000
commit4b2fd047539949218ab84aed8048c67a974b9bf4 (patch)
tree89bbe04b5238ccfc1dd5fd533d4de44337384173 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf92395001236c79db53dd13fdf2073849568bcdb (diff)
parente823f9ea26fe1a97267570032fd84d8cd876ac8c (diff)
Merge \"Merge \\\"Fix VR transition for display on/off sequence.\\\" into nyc-dev am: 931a7c03e0 am: 336a7cb9b5\" into nyc-mr1-dev-plus-aosp
am: e823f9ea26 Change-Id: I9f84dd9b83de294dbafc507db6d9c280d8cfb1a7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions