| commit | cd073ceacdababb7dd58c8d8795ad3fd76617f21 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Mon Dec 01 20:00:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 01 20:00:42 2014 +0000 |
| tree | d417ceeb429bf9f6f663c1dd295bc78822a066dd | |
| parent | 10d9c6f93f90b71c3601a0e7a9a694ec4deb8fa4 [diff] | |
| parent | 227fc67b4ab42f6bbdb076ba3cda89313fb00b82 [diff] |
am 227fc67b: am 142a5001: am ffceb5b6: Merge "Block NFC provisioning if there is data in the FRP partition." into lmp-mr1-dev * commit '227fc67b4ab42f6bbdb076ba3cda89313fb00b82': Block NFC provisioning if there is data in the FRP partition.