tree 94160df0c1915e0b4543e7634d0be916b3130276
parent c0aea2f563d4538197a7735fef5f9287d52a6de5
parent 0ec2348b8523aec675ddee09fe743b44a3b2ca5d
author Chen Xu <fionaxu@google.com> 1504818594 +0000
committer android-build-merger <android-build-merger@google.com> 1504818594 +0000

Merge "Fix Crash CarrierDefaultApp due to exception"
am: 0ec2348b85

Change-Id: I04f22351f158fb6db7ba62f680b8730fd8324f1f