diff options
| author | Adrian Roos <roosa@google.com> | 2015-09-24 22:49:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-24 22:49:19 +0000 |
| commit | 12c54dfa1219c5bb81482fe4bd4b164637f2e8b2 (patch) | |
| tree | 1f536382074074674cc70867e787204a141499e6 /tools/aapt2/JavaClassGenerator_test.cpp | |
| parent | 962c3a0f2dd46d55ea591671c0a90c1c40214af7 (diff) | |
| parent | c9f7abe3705f7c74ad768e0a8e093f6f11e70e1c (diff) | |
am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit 'c9f7abe3705f7c74ad768e0a8e093f6f11e70e1c':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Diffstat (limited to 'tools/aapt2/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions