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)
commit35182218d36f688d646cf5bac603f52bd665c4ab
treeeacda4e6840d30e66027194bbafd68f7e9062812
parent93fe99aca48696d33a40539d646742092a0faa72
parenta65aa77c1c5bbd17fa0fd3d68bd74697ac57251f
Merge "Add additional mocking for Context innards"
am: a65aa77c1c

Change-Id: I7f780c05c46b00457b194bfb13df5814735f0809