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:43:45 +0000 (11:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Dec 2016 11:43:45 +0000 (11:43 +0000)
commit5e8f5f32cdcab5feffffd0baadf8e40fa30b7e9d
tree544431945ba510e087b3426a310abda562605f14
parente0d1a6f2a3d41a4c40e6c1a94c80c3e3428cad90
parent35f1af792dba5503c18d442aad5f761d19626dc5
Merge "Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: e167e6d284" into nyc-mr2-dev-plus-aosp
am: 35f1af792d

Change-Id: I0807ac49f3512299f684825e7383d2d6db01c8c2