tree babdfeb61b15cc902fc3df271d1f3c8a553c9cfc
parent 62077422bbbef42daaf3d9f81b6c06d5740397a2
parent e414f5ed160b6f493ae29ea373cf09320973f9cf
author Shuo Qian <shuoq@google.com> 1538780911 -0700
committer android-build-merger <android-build-merger@google.com> 1538780911 -0700

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

Change-Id: Ic3f48cc3df90edde8c5ed1941a4e5a6f4e7ab572