summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2016-07-14 18:03:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-14 18:03:00 +0000
commit0c1814a153a809746f43fe8b7feb19452d89968b (patch)
treea496d1eda4682533c027d5077700107d0bcb7b5d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent42ec9b86b108f78f285025e3c38fda29b084f6bf (diff)
parente5b46f3bd58314715f5d8d42680c77380e8de299 (diff)
Merge \"Don\'t allow shortcuts with non-main activities\" into nyc-mr1-dev
am: e5b46f3bd5 Change-Id: I1b2e721e0bb44c35c49d8d983bc6b5a3e7a73d3d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions