tree 67b000365ce4cdde5f97dbe8b4cb5cbaa8d8a249
parent 19be2ee686977f95013dfe3c882d7a574cc9f504
parent 671680e50447e6f74b85191f84eeab527bfaf945
author Brad Ebinger <breadley@google.com> 1495657668 +0000
committer android-build-merger <android-build-merger@google.com> 1495657668 +0000

Merge "Support RRO for emergency number conversion map"
am: 671680e504

Change-Id: I74cc3235e07116f2f1e03f24f5ea51b73a86af82