tree cadf33a8e71299c4d0f1dc605e71f2346f2fc4a3
parent 01056b36622eafa657c95f9576ec2b4cacb741a4
parent 3cc72bab488b7395347a3f30b40632d78d819b43
author Craig Lafayette <craiglafa@google.com> 1435582099 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1435582101 +0000

Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev