diff options
| author | Justin Koh <justinkoh@google.com> | 2014-10-02 09:29:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 09:29:57 +0000 |
| commit | 90eca96f3ca93367545ca9c3d291a9a46b980270 (patch) | |
| tree | 4e163618c234e61d5b5252064659766a87f67037 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1e48a1eec0a5f1d015256e38f627947105af5bac (diff) | |
| parent | f7aac12e1bc766a4357ca29d2f248eef265097f8 (diff) | |
am f7aac12e: am bf6f081c: (-s ours) am 37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
* commit 'f7aac12e1bc766a4357ca29d2f248eef265097f8':
DO NOT MERGE Hide the volume panel for watches for now
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions