OSDN Git Service

Merge "Prevent writing to FRP partition during factory reset. am: a9437bd1ca am:...
authorCharles He <qiurui@google.com>
Thu, 29 Dec 2016 11:38:41 +0000 (11:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Dec 2016 11:38:41 +0000 (11:38 +0000)
commit64e9bb46b261dc733d4c143ae0452c8f9a64f3ea
tree544431945ba510e087b3426a310abda562605f14
parent5e9870f7ded1021620348b2e141bbc6e27b5dcc0
parent424aa97a105344f4553e361ba24a4baa8924f113
Merge "Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955 am: 22faa73586" into nyc-mr2-dev-plus-aosp
am: 424aa97a10

Change-Id: Icba07b2f411be7aa7e75b68a595378334476e4f6