Merge "Add Parcelable EmergencyNumber and APIs"

author Shuo Qian <shuoq@google.com>

Fri, 5 Oct 2018 22:29:36 +0000 (22:29 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Fri, 5 Oct 2018 22:29:36 +0000 (22:29 +0000)
author Shuo Qian <shuoq@google.com>
Fri, 5 Oct 2018 22:29:36 +0000 (22:29 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 5 Oct 2018 22:29:36 +0000 (22:29 +0000)
diff --cc Android.bp
Simple merge
diff --cc api/current.txt
Simple merge
author	Shuo Qian <shuoq@google.com>
	Fri, 5 Oct 2018 22:29:36 +0000 (22:29 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 5 Oct 2018 22:29:36 +0000 (22:29 +0000)
		1	2
Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history