diff options
| author | Jonathan Scott <scottjonathan@google.com> | 2019-05-21 19:06:48 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-21 19:06:48 -0700 |
| commit | 7ac759cc1f9fd67ae945736b7869c38b04ac5ea9 (patch) | |
| tree | 30e677a38303f4ba6da026bb31dee2c6237e0e4f /docs/html/sdk/api_diff/17/changes | |
| parent | 65e2fe71eb95d8935275c60570548e3fe33cde1b (diff) | |
| parent | 4a28948fbc8996ecd8dede64aaa044fafb5bc069 (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
am: 4a28948fbc -s ours
am skip reason: subject contains skip directive
Change-Id: I9216f2a70797c39b1504a77c1481522f8891e139
Diffstat (limited to 'docs/html/sdk/api_diff/17/changes')
0 files changed, 0 insertions, 0 deletions