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