summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-11-13 18:37:16 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-13 18:37:16 +0000
commitda131290ae5e476691e05e5eb4ac6d507012a0ac (patch)
tree41aee1924f55b34043ff9453b273257254790956 /tools/aapt2/java/JavaClassGenerator.cpp
parentfed6ffd87a37db056ce14cb3e0a11100e8b82a2f (diff)
parentef15ca85d7f847884e391e3283daabb019e44e10 (diff)
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec
am: ef15ca85d7 * commit 'ef15ca85d7f847884e391e3283daabb019e44e10': DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions