summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2016-06-02 20:43:37 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-02 20:43:37 +0000
commitb58e350e9266b8ced268b21900ab6c065dcac218 (patch)
tree03be792332753f2c967a7ab8030b323714b710e6 /tools/aapt2/java/JavaClassGenerator.cpp
parent18455a9108f36e6577f2eebdbeb7781a0ad4751f (diff)
parenta9f262d649fd1b3b1980a564facc4f1388c541be (diff)
Merge "ShortcutManager: Implement max # of shortcuts" into nyc-mr1-dev
am: a9f262d649 * commit 'a9f262d649fd1b3b1980a564facc4f1388c541be': ShortcutManager: Implement max # of shortcuts Change-Id: I6105a20eb6d8f3840e826ec91bc8db68fdc33e44
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions