summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/17/changes
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-05-22 02:08:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-22 02:08:02 +0000
commit91a615139cff2b51840b4b47bc127087777e1821 (patch)
tree10926b4b3c8c4ec1f091af2e036fb58b7cdc692e /docs/html/sdk/api_diff/17/changes
parent18dedbdbe2fca949f55e6ff0e418a0157f345999 (diff)
parent7ac759cc1f9fd67ae945736b7869c38b04ac5ea9 (diff)
Merge "Merge "[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc-mr1-dev). am: cd6c636800 -s ours am: 84778db6b6 -s ours am: ffc54fc8b9 am: 1eeffeb98c" into qt-r1-dev-plus-aosp am: 4a28948fbc -s ours am skip reason: subject contains skip directive"
Diffstat (limited to 'docs/html/sdk/api_diff/17/changes')
0 files changed, 0 insertions, 0 deletions