| commit | 142a5001c80dac2f4705bc593b4431830c9a8b8f | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Mon Dec 01 13:53:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 01 13:53:56 2014 +0000 |
| tree | 9c0841e8be93d05f7203db36579bcdd9b6844960 | |
| parent | d7ef86c691af4bdf107958cc996d0671ccb80d68 [diff] | |
| parent | ffceb5b63d5e3ac6b47322a0ea40baef4b617542 [diff] |
am ffceb5b6: Merge "Block NFC provisioning if there is data in the FRP partition." into lmp-mr1-dev * commit 'ffceb5b63d5e3ac6b47322a0ea40baef4b617542': Block NFC provisioning if there is data in the FRP partition.