OSDN Git Service

Merge "Remove Context from mockContentResolver to avoid a Null Pointer Exception...
authorAjay Panicker <apanicke@google.com>
Thu, 23 Mar 2017 17:33:01 +0000 (17:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 23 Mar 2017 17:33:01 +0000 (17:33 +0000)
commit84e4884c57593b2e2ec9f172c571050cd46c7adc
tree12c231650cf55adfe2091340eee209c2b4e4aa91
parenta46f78b7581fa6e4395c1f6953c820df4142ddd2
parent277ca2bae4282e175352d9d0456555b68f4421f8
Merge "Remove Context from mockContentResolver to avoid a Null Pointer Exception" am: 60a96344f5
am: 277ca2bae4

Change-Id: I14fc1d2b775eaf41de0a283d568a5a538a2e8b39