Merge "Merge "Un-deprecated Android mock testing APIs" into nyc-dev am: dac0708ea0 am: 14ba2e78fd" into nyc-mr1-dev-plus-aosp

am: 4407a3de81

* commit '4407a3de8158d2ddbb6d66c58fc1c723f830926d':

Change-Id: If07e462e6c2b1ebd266f470131526e21a099118e
This commit is contained in:
Stephan Linzner
2016-05-26 01:29:24 +00:00
committed by android-build-merger

Diff Content Not Available