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