Merge "Small change for new sample test code am: acb3eb39da am: be34171986" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-09-20 21:47:57 +00:00
committed by Android (Google) Code Review

Diff Content Not Available