summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/21/changes
diff options
context:
space:
mode:
authorPrashant Malani <pmalani@google.com>2015-06-11 23:52:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-11 23:52:49 +0000
commit327b481f1f2499eaa5ab938e63a2c12c21fe7482 (patch)
tree95252960bc49db59dd72c319fe9c57907ebef6d2 /docs/html/sdk/api_diff/21/changes
parent88bc9753c30c9ab3c92d074ae49520cfa2258b16 (diff)
parent786cd12f785374f93c19c909687ea300e41ffbc2 (diff)
am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
* commit '786cd12f785374f93c19c909687ea300e41ffbc2': DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
Diffstat (limited to 'docs/html/sdk/api_diff/21/changes')
0 files changed, 0 insertions, 0 deletions