summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2015-01-28 01:38:08 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-28 01:38:08 +0000
commit715437763c56a8a23d9ce711b011bdddc90e7b61 (patch)
tree2010e524f8dade94e1c57b146487ef91004604ef /tools/aapt2/java/JavaClassGenerator.cpp
parentef43819a7cb5bb2bd18fe1a81f4ed63245442389 (diff)
parentff1876d1fb8dfcaba61d3fc7de296d663a4e160e (diff)
am 0c607b97: am f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-dev
automerge: ff1876d * commit 'ff1876d1fb8dfcaba61d3fc7de296d663a4e160e': Fix 'always' preferred app assignment
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions