summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorNicolas Prevot <nprevot@google.com>2015-01-22 10:37:56 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-22 10:37:56 +0000
commit8b5daa6be2c74cdd9d1a0e8aee60eb82d66c3f99 (patch)
treee8f5e0d759b4096e32f25712df8d445b367d0e5c /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta925f99678e7126f1659d030d590ad5fdccf3e3c (diff)
parent2cb240e083ddf8e700d04cae6d243d2aab4d65e4 (diff)
am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge: ad44f74
automerge: 2cb240e * commit '2cb240e083ddf8e700d04cae6d243d2aab4d65e4': Never set "Work" or "Personal apps" as prefered activities.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions