summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMatthew Fritze <mfritze@google.com>2016-07-21 01:06:10 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-21 01:06:10 +0000
commitaa79a3c1359f27e74f02d10ad20daec5f7c280a5 (patch)
treeaa8b77bc19c2809fcbb9443e5e3acf790d98b79a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3c37412900502fd491cc40e1df594ee1f45af1b2 (diff)
parent22d09743d875d8a2fdf6c6ddf99bc371bfc899dd (diff)
Merge \"Revert \"Error colors to point to frameworks rather than hard-code them\"\" into nyc-mr1-dev
am: 22d09743d8 Change-Id: If9113aab011035227930b2df6b68341ee3774bd3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions