From: Amit Mahajan <amitmahajan@google.com>
Date: Tue, 29 Jan 2019 05:37:07 +0000 (-0800)
Subject: [automerger skipped] Merge "Add Emergency Uniform Resource Number (URN)" am: e01a358b... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=66de7ff591d3b830e0c9a21265084cce7e190ecb;p=android-x86%2Fframeworks-base.git

[automerger skipped] Merge "Add Emergency Uniform Resource Number (URN)" am: e01a358b5b am: 888d87ac7a
am: c322894cb2 -s ours
am skip reason: change_id I87537f7123910e9843207428eb3167a90a15b6df with SHA1 03bde886e5 is in history

Change-Id: Idf675239864ed69a1566f9212652cf8c74c3920b
---

66de7ff591d3b830e0c9a21265084cce7e190ecb