| commit | eaad643d46f3427ed693393d48039c44695eb86d | [log] [tgz] |
|---|---|---|
| author | Jesse Badash <badash@google.com> | Fri Jan 27 23:18:17 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 27 23:18:25 2017 +0000 |
| tree | 3ac07c63fc4875831b44017b247bf21ad37edd89 | |
| parent | 237840fed0fba6318a35ebad9f6bcdb0c002818a [diff] | |
| parent | 460dfcc78f05185c68c46d8c5c22e19baabf2b25 [diff] |
Merge changes I1024f2a5,If3f024a1 into security-aosp-nyc-mr1-release * changes: Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. Prevent writing to FRP partition during factory reset.