| commit | 35f1af792dba5503c18d442aad5f761d19626dc5 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Dec 29 11:25:55 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 29 11:25:59 2016 +0000 |
| tree | c201dfcfc55f0fdc6fa8782a82f7f200377f6a9a | |
| parent | 424aa97a105344f4553e361ba24a4baa8924f113 [diff] | |
| parent | 4c57f6f500369751775ff31119c3f6e772719b23 [diff] |
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