Merge \"Fix timeout in a test utility method\" into nyc-mr1-dev

am: 648d3030a7

Change-Id: I0dc46ba4967e3094f9d08aa490a70ae94efa3263
This commit is contained in:
Makoto Onuki
2016-07-28 17:48:41 +00:00
committed by android-build-merger

Diff Content Not Available