diff options
| author | Andrew Lee <anwlee@google.com> | 2014-11-19 19:18:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 19:18:05 +0000 |
| commit | fc865670b614b70def962eb816a43f0a69e36c73 (patch) | |
| tree | 78b90581438cdd9aabf6bb8f0b2d666dc88835c7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 10e4a45f691e6b60278fc772dedfe7646e615d0e (diff) | |
| parent | 76cc56c0f94ff8f965ab33663649c100d86e4e9e (diff) | |
am 76cc56c0: am 3f424477: am e6a1e993: Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev
* commit '76cc56c0f94ff8f965ab33663649c100d86e4e9e':
Add GENERIC_CONFERENCE to phone capabilities.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions