diff options
| author | Andrew Lee <anwlee@google.com> | 2014-11-19 19:06:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 19:06:32 +0000 |
| commit | 3f4244773d4479c79705dc397abf0d76555d7ef9 (patch) | |
| tree | 702d4951639c059329fcf52cc3ad506764d4222c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 29db396ea91651f2f17e21629f782ce4c19e0f33 (diff) | |
| parent | e6a1e993c2e3663ee60085b66fe8697d5de6e268 (diff) | |
am e6a1e993: Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev
* commit 'e6a1e993c2e3663ee60085b66fe8697d5de6e268':
Add GENERIC_CONFERENCE to phone capabilities.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions