Skip to content
Commit dd5bb95b authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Change the parameter type from ContentResolver to... 

[automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 0aa48757 am: 825bc7bb am: 33f340b5 -s ours

am skip reason: skip tag Change-Id I5702c7d74b862a76558b94f1abe2c6df9eb7f097 with SHA-1 2b9d0b20 is already in history

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

Change-Id: Id713c440298bb0c410fbba74cb62550e1d5f90e9
parents d28b0419 33f340b5
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