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