tree d7ad689c9602b27889436da00218f800673c79eb
parent 27617a98949f9b1d7ca3a5760304e6837fda589c
parent 0713fcf66d99ed76f8618866855d8ad2b508bff4
author fionaxu <fionaxu@google.com> 1519794193 +0000
committer android-build-merger <android-build-merger@google.com> 1519794193 +0000

Merge "Don't throw exception if phone process is dead for carrier ID APIs" am: 8c32954906
am: 0713fcf66d

Change-Id: Iacf464a898da538795152135b0c40cd648bbdf7d