| commit | 2df7d1ef51ebff5228e0cbd7e15a34fce7307390 | [log] [tgz] |
|---|---|---|
| author | Esteban Talavera <etalavera@google.com> | Thu Aug 21 14:58:17 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 21 14:58:18 2014 +0000 |
| tree | 5dcb9af2407b8cd3fa4d690f2d53aa319700df10 | |
| parent | 20303426ac8476f33fbb1a0b99dad6aa59e6bb32 [diff] | |
| parent | f057f06631e32471cd1ce8f34222251c0537a406 [diff] |
Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev