diff options
author | Adrian Roos <roosa@google.com> | 2015-10-15 00:45:23 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-15 00:45:23 +0000 |
commit | 67255b4403df91d8405506ecac6965367093cd6b (patch) | |
tree | 11519fbbef6ecc5e4c07050831b41f215ac5f06e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f12a7499dee29904ef15d4f7f9ef60e0ebc4c341 (diff) | |
parent | c007c150d5f56305e84af44d7993d8f2e6a4fc78 (diff) |
am c007c150: am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev
* commit 'c007c150d5f56305e84af44d7993d8f2e6a4fc78':
Send next alarm's show intent via PendingIntent
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions