tree 67b1f18b98517a4660cf945588be80cc2f509abd
parent 44ecac1bc9fbb2939b31c8d08ed24de9a3433332
parent 729f76f68d41fd3d0871a10df58c35cf2345a201
author Iliyan Malchev <malchev@google.com> 1354865029 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354865029 -0800

am 729f76f6: am 14ab5b3d: am aadb07dc: Merge "mako: Add custom emergency numbers of KR,BR" into jb-mr1.1-dev

* commit '729f76f68d41fd3d0871a10df58c35cf2345a201':
  mako: Add custom emergency numbers of KR,BR