summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/24/changes
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-05-21 18:53:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-21 18:53:10 +0000
commit4a28948fbc8996ecd8dede64aaa044fafb5bc069 (patch)
tree3635298f805c8855254e23658372149270134018 /docs/html/sdk/api_diff/24/changes
parent99816c8226529aaccf7150b20be81fe783114817 (diff)
parentd481577b64cd1bf709f297af34d1ed6e00cc874a (diff)
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
Diffstat (limited to 'docs/html/sdk/api_diff/24/changes')
0 files changed, 0 insertions, 0 deletions