tree a334cfc19fbcc308e45055e7e9d2dbe210e4ba5f
parent 3dcc20f248dd3f1547ef19d96c0d98deb1502cb5
parent 083a491f4d5d6d4037fb682f3f18e19f2a647230
author Garfield Tan <xutan@google.com> 1499295577 +0000
committer android-build-merger <android-build-merger@google.com> 1499295577 +0000

Merge "Merge "Clear calling id before updating MediaStore." into oc-dr1-dev am: 28042d09d1" into oc-dr1-dev-plus-aosp
am: 083a491f4d

Change-Id: I293ca3e7765629a1f04e14aad2841bcb7d1f763a