diff options
| author | Adrian Roos <roosa@google.com> | 2015-10-15 03:21:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-15 03:21:17 +0000 |
| commit | 055c33b0c861b39c7820a5bbb4227d1e87cd7898 (patch) | |
| tree | 2cc7f4bbe7d4f8b1365f39e813915bf3a706ed67 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 22ba3a4acec1669bcb35a33bafb5740a9bf48bc7 (diff) | |
| parent | d06f20f9e1dd7be42225896e6eb34354c33392e6 (diff) | |
am d06f20f9: (-s ours) am 67255b44: am c007c150: am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev
* commit 'd06f20f9e1dd7be42225896e6eb34354c33392e6':
Send next alarm's show intent via PendingIntent
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions