tree 7b4ba36453bad079c0b9561310c98dbc2c66af70
parent 48011de49f3df3e080b8faf9c32ec77903c116f7
parent d373b6c4a5d683a5fbd09b221cd209b8f0d1a2bd
author Colin Cross <ccross@android.com> 1513130288 +0000
committer android-build-merger <android-build-merger@google.com> 1513130288 +0000

Merge "Use a.t.mock.stubs instead of a.t.mock.sdk" am: 87c6fcf126 am: 88f12fdcce
am: d373b6c4a5  -s ours

Change-Id: I86e0ae275098b662783ca97b9a73bbcd80cac611