Skip to content
Commit e39c9464 authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa am:... 

[automerger skipped] Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa am: a9f241bb -s ours am: 5ea7cd28 -s ours

am skip reason: Change-Id Ifd87b5e38f341db4b34bf9f61480e29e49148846 with SHA-1 d3c01ef5 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587046

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44df4bb309bd00dc5f8094aefdb92484fc6cdb5c
parents 6777f05b 5ea7cd28
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment