OSDN Git Service

Merge \"Zero out blocks if BLKSECDISCARD fails\" into nyc-mr1-dev
authorPaul Crowley <paulcrowley@google.com>
Wed, 13 Jul 2016 19:54:02 +0000 (19:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Jul 2016 19:54:02 +0000 (19:54 +0000)
am: d6a39dd78a

Change-Id: I7ee62f8cb0b2144f4385bd132a3d32ecf3d918d2


Trivial merge