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