summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/11
diff options
context:
space:
mode:
authorTony Mak <tonymak@google.com>2017-04-06 13:29:52 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-06 13:29:52 +0000
commitbd24ce1d0b21035e73b807f9304ce449e83219db (patch)
treee6ee48180c49999daed7ace539e841f88b267163 /docs/html/sdk/api_diff/11
parent24ff909a27f04900e7bb62d4e2baf2a36b8cb4d3 (diff)
parent343715b1c195dc08bce4157bdfb58403679aa9e5 (diff)
Merge "Do not stop lock task if it is starting background user" into oc-dev
am: 343715b1c1 Change-Id: Icf08aa23cca59f81f8dc3ca7c5f285e23953bb2b
Diffstat (limited to 'docs/html/sdk/api_diff/11')
0 files changed, 0 insertions, 0 deletions