tree 11d8eb4bcea4c8059ee0ac716d321f1d1227411b
parent a405a9aba999cd9b2710cb93e2ae3146e328d4ff
parent a406b5fc8c99b50812e9e1a97cdaa4cb1be505ee
author Shaopeng Jia <shaopengjia@google.com> 1321613390 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321613390 -0800

am a406b5fc: Cherry pick relavant changes to mr0 to fix bug of losing national prefix in formatInOriginalFormat.

* commit 'a406b5fc8c99b50812e9e1a97cdaa4cb1be505ee':
  Cherry pick relavant changes to mr0 to fix bug of losing national prefix in formatInOriginalFormat.