Merge "Small change for new sample test code am: acb3eb39da am: be34171986" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
05388c5918