diff options
| author | Justin Koh <justinkoh@google.com> | 2014-10-01 00:59:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 00:59:06 +0000 |
| commit | 870ba83b3d197abb62bf65a1cf0f4ebfcb027de1 (patch) | |
| tree | c30b58a761398d499912991f61c8242ddb4e3390 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a1411fe08f1d65a6cb29f7e71ca259e0aecc399d (diff) | |
| parent | 8dd8818bdeb7b264f82da0f0854722ffd7ab7e12 (diff) | |
am 8dd8818b: am 91bd8769: am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
* commit '8dd8818bdeb7b264f82da0f0854722ffd7ab7e12':
DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions