tree 2c9a0c470b53d94b430fa9158b078bc07321943f
parent 76d87e60a6ded831976dd2b98665a88f6fe3468f
parent 97042ad81d607612ba1f96c30a94212fb1f486b2
author Treehugger Robot <treehugger-gerrit@google.com> 1601295254 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601295254 +0000

Merge "Add corinac and remove shafik to/from OWNERS of MediaProvider" am: 48c28006db am: b03aff2468 am: 28d50a55a2 am: 97042ad81d

Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1431748

Change-Id: I902ec2962f582cf33070fe93c929c144b8c0a0ad