OSDN Git Service

Merge "Add additional mocking for Context innards"
authorErik Kline <ek@google.com>
Wed, 7 Jun 2017 09:40:37 +0000 (09:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Jun 2017 09:40:37 +0000 (09:40 +0000)
am: a65aa77c1c

Change-Id: I7f780c05c46b00457b194bfb13df5814735f0809


Trivial merge