tree c86c550a85cecf982fa78cf40a3b56388a97278c
parent 4b830c5a7086020194f4ab900c16fa579bca037b
parent c9ac62857d0a3538bb446fc0df0f584c0e1d1aa9
author Mary Yanchar <myanchar@google.com> 1474405392 +0000
committer android-build-merger <android-build-merger@google.com> 1474405392 +0000

Merge "Small change for new sample test code" into nyc-dev am: e5e9265e09
am: c9ac62857d

Change-Id: Iede40ce493f46da6d74038e222c820993b6bb072