| commit | 09945c0bdef5acf8276d433a96de3a5589b2de86 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Sep 24 23:32:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 23:32:01 2015 +0000 |
| tree | b794743ce81ef7ff81bd256d03d11db5210af11d | |
| parent | 9971167fbe7f3b356ba7fd89d91271376a56d235 [diff] | |
| parent | fe7ceca1acdbcde6449f57bb19b45f8c948cc1f5 [diff] |
am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev * commit 'fe7ceca1acdbcde6449f57bb19b45f8c948cc1f5': DO NOT MERGE Send next alarm's show intent via PendingIntent