Merge "Improvements to sample verification code" am: 9e25446699 am: a0931a720d am...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 17:39:07 +0000 (17:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:39:07 +0000 (17:39 +0000)
am: 1416b8427a

Change-Id: I0e775a4c9c753ed945a3ca023ec1a740ca7633a1


Trivial merge