summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-09-24 23:32:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-24 23:32:01 +0000
commit09945c0bdef5acf8276d433a96de3a5589b2de86 (patch)
treeb794743ce81ef7ff81bd256d03d11db5210af11d /services
parent9971167fbe7f3b356ba7fd89d91271376a56d235 (diff)
parentfe7ceca1acdbcde6449f57bb19b45f8c948cc1f5 (diff)
downloadframeworks_base-09945c0bdef5acf8276d433a96de3a5589b2de86.zip
frameworks_base-09945c0bdef5acf8276d433a96de3a5589b2de86.tar.gz
frameworks_base-09945c0bdef5acf8276d433a96de3a5589b2de86.tar.bz2
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
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions