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