summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorEsteban Talavera <etalavera@google.com>2014-12-12 17:08:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-12 17:08:46 +0000
commit4f40fb471265a164a0bdfd060d90375ce706b1dd (patch)
tree716f71981ee1eef61cbf7e6c2118759464c16e14 /tools/aapt2/java/JavaClassGenerator.cpp
parente741a3e9fe1d710f5531d134ae317d2b73c57292 (diff)
parentc28fa2cdd4692faafc520972b71ddbac1feec4d3 (diff)
Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev
automerge: c28fa2c * commit 'c28fa2cdd4692faafc520972b71ddbac1feec4d3': Take into account other profiles when deciding whether to show ResolverActivity
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions