OSDN Git Service

Merge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3
authorErik Kline <ek@google.com>
Wed, 7 Jun 2017 09:51:52 +0000 (09:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Jun 2017 09:51:52 +0000 (09:51 +0000)
commit48c3c00ee1a600c57c88533f00f3020bb8890cbf
tree4ab34bbb82f778e416b0079b660c080cca92f53e
parentf5b8d18798099c5fdd87f8c40aa7107a1644dbb6
parentf22995eed577788c95bde827aad54f2f2863c14b
Merge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3
am: f22995eed5

Change-Id: Ibde5e3e048236d32ea3c1ba2c2700bb6a75323e6