Skip to content
Commit a9f9ccbc authored by Xin Li's avatar Xin Li Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Merge Android R" am: 8ac6741e -s ours am: b9db5b54 -s ours 

am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d is in history

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

Change-Id: Ie915db11679ce05f5d37815028015f61ffb1a4a6
parents 16ae100a b9db5b54
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