tree a2999fabc584109d163934a293d9e29fc13087f6
parent a4fab98d938d76a21de9da42f225c80f86a37db0
parent b20b5cc8120fa76b09716fc9c00353d554aa7fa8
author Chen Xu <fionaxu@google.com> 1504820900 +0000
committer android-build-merger <android-build-merger@google.com> 1504820900 +0000

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

Change-Id: Ifb7fa6ccf70b0835c52716577a2f335e30c02b9a