summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/12/changes
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-12-08 19:43:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-08 19:43:38 +0000
commitef10307e4a4942c5867ba696e12e13556ac7a716 (patch)
treeda4f54903ae15dc619bf7b88ac0c7ab3f373a987 /docs/html/sdk/api_diff/12/changes
parentfb4c06dafb8c4d04e94f26f3c59d351103f340db (diff)
parent20a46fb14fa961638c0c155ea58e75ba5e33bb4e (diff)
am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev
* commit '20a46fb14fa961638c0c155ea58e75ba5e33bb4e': Zen: New behavior for built-in downtime + nextalarm conditions.
Diffstat (limited to 'docs/html/sdk/api_diff/12/changes')
0 files changed, 0 insertions, 0 deletions