| commit | 227fc67b4ab42f6bbdb076ba3cda89313fb00b82 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Mon Dec 01 19:46:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 01 19:46:14 2014 +0000 |
| tree | f4ac32a07b8d40c3a14f8344d7f4c44e0b4168a0 | |
| parent | 57306049c63876ffcd6ca3faa89d4be40d735eb4 [diff] | |
| parent | 142a5001c80dac2f4705bc593b4431830c9a8b8f [diff] |
am 142a5001: am ffceb5b6: Merge "Block NFC provisioning if there is data in the FRP partition." into lmp-mr1-dev * commit '142a5001c80dac2f4705bc593b4431830c9a8b8f': Block NFC provisioning if there is data in the FRP partition.