diff options
| author | Jordan Jozwiak <jjoz@google.com> | 2020-06-12 17:24:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-12 17:24:47 +0000 |
| commit | ef80d727a8bd4cfbdd08aa0bebdf7cc156af0aaf (patch) | |
| tree | 4962406fe6f59f851f7187a619b1ee77a2adffd3 /docs/html/sdk/api_diff/20 | |
| parent | b745ea271cb459295c7e474ee263530a28201942 (diff) | |
| parent | 79f36b5534f2314b3515b84beaaebdb675be7074 (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655cbe am: 5756ae944f am: 3c38b25d42 am: 79f36b5534 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858
Change-Id: I8e6f20e0030180c62dbd95ad10f8cde3327ca4cd
Diffstat (limited to 'docs/html/sdk/api_diff/20')
0 files changed, 0 insertions, 0 deletions