commit b860a6a419838da8d2fee7a85c9f220d8619d7f3
author Robin Lee <rgl@google.com> Mon Aug 04 16:21:09 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 04 16:21:09 2014 +0000
tree fd0b326dea11b9cf90eef4263a2b1e358d87752c
parent 4fabf2ae7845b2151b24d62f6d8c10bd2d70cc3c
parent 247f3c4dc8a723898e571f9913ad306ee77bc7dc

am 247f3c4d: am 4af4ed0f: Provisioning: Add internal alias for continue flow

* commit '247f3c4dc8a723898e571f9913ad306ee77bc7dc':
  Provisioning: Add internal alias for continue flow

src/com/android/managedprovisioning/MessageParser.java

diff --git a/src/com/android/managedprovisioning/MessageParser.java b/src/com/android/managedprovisioning/MessageParser.java
index 1aa1679..e611bdb 100644
--- a/src/com/android/managedprovisioning/MessageParser.java
+++ b/src/com/android/managedprovisioning/MessageParser.java
@@ -168,7 +168,7 @@
         }
         throw new ParseException(
                 "Intent does not contain NfcRecord with the correct MIME type.",
-                R.string.device_owner_error_parse_fail);
+                R.string.device_owner_error_general);
     }
 
     private ProvisioningParams parseProperties(String data)