diff options
| author | Esteban Talavera <etalavera@google.com> | 2014-12-12 17:19:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-12 17:19:42 +0000 |
| commit | c872c7f7d5153b28443c7ee86252e46fba680bb9 (patch) | |
| tree | 637422794fcbc72fbadbe700577f20af37685dbe /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | b16be0706b92763365efac431ea4fac3236359e7 (diff) | |
| parent | 0b7b87a4c8fec008ca5bdefcd03d8d0ea70f61a0 (diff) | |
am 4f40fb47: Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev automerge: c28fa2c
automerge: 0b7b87a
* commit '0b7b87a4c8fec008ca5bdefcd03d8d0ea70f61a0':
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