OSDN Git Service

Merge "Remove Context from mockContentResolver to avoid a Null Pointer Exception...
authorAjay Panicker <apanicke@google.com>
Thu, 23 Mar 2017 17:36:07 +0000 (17:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 23 Mar 2017 17:36:07 +0000 (17:36 +0000)
commit2bb4ff683b76d7d228c8c0e1f466b1bb19ccc8c9
treea4dc823cd87c3800a54b9192b146f822f69df72d
parent8cd0a17a7d64e34178807f178be63b12f5cd4688
parent84e4884c57593b2e2ec9f172c571050cd46c7adc
Merge "Remove Context from mockContentResolver to avoid a Null Pointer Exception" am: 60a96344f5 am: 277ca2bae4
am: 84e4884c57

Change-Id: I74329956dbe0c7ce64093a2f7539f0f68ebc4f6c