diff options
| author | John Spurlock <jspurlock@google.com> | 2015-04-30 16:25:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-30 16:25:19 +0000 |
| commit | b7ca2709c3e079c54f5a8e517d602d313b96fde8 (patch) | |
| tree | f85004ae7079b47a74f49d6860bd8479c606045d /tools/aidl/generate_java.cpp | |
| parent | 2e52f82440a2f0e78e23d3138e31cfdd4e239563 (diff) | |
| parent | 0f4c6a8bdf6444d05a6d9de3b32ec2bc7f39f1b3 (diff) | |
am 0f4c6a8b: am 1642e354: am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev
* commit '0f4c6a8bdf6444d05a6d9de3b32ec2bc7f39f1b3':
Zen: New event condition data model.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions