diff options
author | Tingting Wang <tingtingw@google.com> | 2015-07-17 18:30:56 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 18:30:56 +0000 |
commit | 6aee4761a826c3ef2793dc5c62d2451bd7450c61 (patch) | |
tree | ab3eec73a233f1c0fce71bb936818af0fc4ab1e7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 098a88e6a330c123c3daeda334e91c8656ecb4b2 (diff) | |
parent | ad359f2e705280e26198890a95d53e3566126bcc (diff) |
am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
* commit 'ad359f2e705280e26198890a95d53e3566126bcc':
Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions