OSDN Git Service

Merge "Add additional mocking for Context innards" into oc-dr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 12 Jun 2017 05:06:35 +0000 (05:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 12 Jun 2017 05:06:43 +0000 (05:06 +0000)

Trivial merge