| commit | 45bbf54a0d5c14ff7dd9f77d7569053df72179b8 | [log] [tgz] |
|---|---|---|
| author | Esteban Talavera <etalavera@google.com> | Fri Mar 20 23:13:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:13:11 2015 +0000 |
| tree | 648b1d3d905516553b8a4d7062ab5a96d317d54b | |
| parent | 2373e9754e84091b9afbbcf410eaf3019084e519 [diff] | |
| parent | 7bb567594dbd216ee6fe9d53570934cd0f1b93ea [diff] |
am 7bb56759: am 83eb39eb: am 8fdc73cc: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev * commit '7bb567594dbd216ee6fe9d53570934cd0f1b93ea':