| commit | f02ba4b8ffc44ccbb94ebcf1b70b77fc06af83d4 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Sep 24 23:40:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 23:40:43 2015 +0000 |
| tree | 19f5ad8ddadb7df160c133e4ad74ab3f88d44277 | |
| parent | e1de9f674575df3b17e475c4f32dd93d33e596e3 [diff] | |
| parent | 09945c0bdef5acf8276d433a96de3a5589b2de86 [diff] |
am 09945c0b: 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 '09945c0bdef5acf8276d433a96de3a5589b2de86': DO NOT MERGE Send next alarm's show intent via PendingIntent