| commit | fc3487fe496651544d928eefcd817eacabb9a225 | [log] [tgz] |
|---|---|---|
| author | Esteban Talavera <etalavera@google.com> | Thu Aug 21 15:31:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 15:31:58 2014 +0000 |
| tree | 6c64d3b1633ef8078c13db4680b8b80d4f151c9b | |
| parent | 4d3fc0b8288fbc39671ed195bc6cf538b81a0988 [diff] | |
| parent | e17fce679a023f8a653f3268d6a960b8e61abefe [diff] |
am 25900c0a: am 82e2dd54: am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev * commit '25900c0a347ae6d79efc0a96b06cf6933bd7c741': Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC