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

Change-Id: Id9894949e91b15aa387ea30130e8848eb1fb5c37


Trivial merge