diff options
author | Zach Riggle <riggle@google.com> | 2015-09-17 22:25:53 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-17 22:25:53 +0000 |
commit | ad0acf1d104988238f431d874f0ecf9917a06699 (patch) | |
tree | fc66900111f3cb4bb6bfdff9f86734e92fe3c8e4 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 716c6269674474867dc4720f86f739c639c83400 (diff) | |
parent | 9836b64f529238d1219f1937abf481383cd0cacd (diff) |
am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
* commit '9836b64f529238d1219f1937abf481383cd0cacd':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions