diff options
| author | Jordan Jozwiak <jjoz@google.com> | 2020-06-12 17:24:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-12 17:24:44 +0000 |
| commit | b745ea271cb459295c7e474ee263530a28201942 (patch) | |
| tree | 4962406fe6f59f851f7187a619b1ee77a2adffd3 /docs/html/sdk/api_diff/20/changes | |
| parent | a0c2b9034d2a8eddfa5c21a36bd85af5b75845b1 (diff) | |
| parent | 45701de93f19122baf16ace8c2a57c33fb9a3e95 (diff) | |
[automerger skipped] DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 am: a50847e505 am: d140dfb3ff am: 45701de93f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858
Change-Id: Ia8006b49a1566425edcb7775cb8e4695bf9262f1
Diffstat (limited to 'docs/html/sdk/api_diff/20/changes')
0 files changed, 0 insertions, 0 deletions