Merge "Improvements to sample verification code" am: 9e25446699 am: a0931a720d am...
authorPyry Haulos <phaulos@google.com>
Wed, 10 Aug 2016 19:42:13 +0000 (19:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Aug 2016 19:42:13 +0000 (19:42 +0000)
am: 3e59e6fe91

Change-Id: Ife0bb2198d9df77ec953149a58b764b9b10701e7


Trivial merge