summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorShishir Agrawal <shishir@google.com>2015-01-06 00:37:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-06 00:37:07 +0000
commit8955c54e0ea24a907c7ce06e7f2f3dd3afc84cda (patch)
tree89cf6249a9694153a844f832f1888887fdca1851 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent2bdf89b167d709e170150e5ae5bf888e6535c1fd (diff)
parent7287ed3d4b8d5d56855a8996ace4425ceaccf510 (diff)
Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions