OSDN Git Service

Merge "Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1...
authorCharles He <qiurui@google.com>
Thu, 29 Dec 2016 11:49:33 +0000 (11:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Dec 2016 11:49:33 +0000 (11:49 +0000)
am: 78129e30a4

Change-Id: I3a42d21df986dbaac5adb082d3bb85300461c15c


Trivial merge