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

am: d373b6c4a5  -s ours

Change-Id: I86e0ae275098b662783ca97b9a73bbcd80cac611
main
Colin Cross 2017-12-13 01:58:08 +00:00 committed by android-build-merger
commit fc55b74b57

Diff Content Not Available