tree 9938b6a9c78dda4dab9939dac37d07dad53a72f5
parent 46f1dfdf2d52a03190f1122d1169fa64059a04b8
parent 379ca95c89e32579236280d7c1eacf6c80dda206
author Shuo Qian <shuoq@google.com> 1538779898 -0700
committer android-build-merger <android-build-merger@google.com> 1538779898 -0700

Merge "Add Parcelable EmergencyNumber and APIs"
am: 379ca95c89

Change-Id: I03c07a695d03409e6be4f5a98f37d4191bdc5dd1