tree 6fcfa1076c7864d5dd351cd6dd5c83d5c20fc786
parent 721847320b48645cec26247c55cbcc0c6b6215d8
parent 73dcab62b73f9eb49c179c6b8cf95a1385f3064a
author Brad Ebinger <breadley@google.com> 1482181301 +0000
committer android-build-merger <android-build-merger@google.com> 1482181301 +0000

Merge "Add UI prompt for MMI code failure on 3gpp" into nyc-mr2-dev
am: 73dcab62b7  -s ours

Change-Id: Id30938ad8395a57b7a39becd3c7834df75b2ba07