diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-06-24 21:48:19 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-24 21:48:20 +0000 |
commit | 9dca3a006031bcffd1f1ba43f163e52aaaa07ee8 (patch) | |
tree | c81d4c199fd2b0b9b37382dfa8378debc239a44d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 57a289865b05ad0c9b84e0d53d825c78082c28a4 (diff) | |
parent | a9d2a39bb1f2482b03bc8e8473d16b8471c5286e (diff) |
Merge "Merge \\"Shortcut: Only \\"main\\" activities can have shortcuts.\\" into nyc-mr1-dev am: 1af9a58956 am: 312933e043"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions