diff options
| author | 2019-01-28 21:37:07 -0800 | |
|---|---|---|
| committer | 2019-01-28 21:37:07 -0800 | |
| commit | 66de7ff591d3b830e0c9a21265084cce7e190ecb (patch) | |
| tree | ad9601b00864d3574f34b95ff70efd364ae706fa /libs/androidfw/ResourceUtils.cpp | |
| parent | 2ef1ad5216d830b97c20c899e9a3fc1e50d3bc0f (diff) | |
| parent | c322894cb2bd859e136c9543107f37926656e96b (diff) | |
[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
Diffstat (limited to 'libs/androidfw/ResourceUtils.cpp')
0 files changed, 0 insertions, 0 deletions