tree 018799650acf2f7f9fd87ffb41a02981cbd6c461
parent 6d5fbe61f8931af185f0c937a7b042679bc097a2
parent 1f4a5f884825bd94216fde89477ec4dd45048bd5
author Chen Xu <fionaxu@google.com> 1504826470 +0000
committer android-build-merger <android-build-merger@google.com> 1504826470 +0000

Merge "Merge "Fix Crash CarrierDefaultApp due to exception" am: 0ec2348b85 am: 9d2c715d37 am: b20b5cc812" into oc-mr1-dev-plus-aosp
am: 1f4a5f8848

Change-Id: Ic85ade8384be8cd27248374b8998f63025c74024