diff options
author | Scott Main <smain@google.com> | 2014-04-01 00:24:53 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-01 00:24:53 +0000 |
commit | 0ba2de8530a5006538154fb5151081c60afef52d (patch) | |
tree | 620c7fe4c840bc46a5343d6a3e6074f208c08b65 /rs/java | |
parent | 658e9080215ca852b15633ce4926a738ed24f9ef (diff) | |
parent | 7471a3b1ea3b722168ed3e932d4015750c913c0b (diff) | |
download | frameworks_base-0ba2de8530a5006538154fb5151081c60afef52d.zip frameworks_base-0ba2de8530a5006538154fb5151081c60afef52d.tar.gz frameworks_base-0ba2de8530a5006538154fb5151081c60afef52d.tar.bz2 |
am 7471a3b1: am adcb288e: am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs
* commit '7471a3b1ea3b722168ed3e932d4015750c913c0b':
update common intents guide to add calendar and alarms.
Diffstat (limited to 'rs/java')
0 files changed, 0 insertions, 0 deletions