tree 030d92831754970f1b18ed144b09f2679942d346
parent 01944f6d69f02d7aae3224f6d49df60f0872d829
parent a7cc9ef8c14cd90839bbf49802e00836a2573497
author Chen Xu <fionaxu@google.com> 1550166157 -0800
committer android-build-merger <android-build-merger@google.com> 1550166157 -0800

Merge "add null pointer check before installing ota carrier id" am: 121360885b
am: a7cc9ef8c1

Change-Id: I1ffab9bd15e53e243a9a2ad9ac918c73f6b0cff8