diff options
| author | Cedric Ho <cedricho@google.com> | 2015-04-27 21:10:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-27 21:10:55 +0000 |
| commit | 452304f7195a782f5448ecf8bda7be11d5536982 (patch) | |
| tree | 49cac99a612c0bb9a8048b20b21bcadb8ef38f04 /tools/aidl/generate_java.cpp | |
| parent | 528887b23bdf105835e98f2e50ecfbbb71468fb9 (diff) | |
| parent | 25d12e3f6a5ef15add0c0ccb560bb842283b98e2 (diff) | |
am 25d12e3f: Merge "resolved conflicts for merge of 0af3af03 to mnc-dev" into mnc-dev
* commit '25d12e3f6a5ef15add0c0ccb560bb842283b98e2':
Enable VoiceInteractionService on watch.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions