tree eb567ab85c2c1467fa2bf03a8c5681674dd585bc
parent 09816517faaf29a78bc4cc11810b73a78ff6d4e3
parent 2b631dd217a0267fc8a749119bb45bb95b542501
author David Brown <dab@google.com> 1321659298 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321659298 -0800

am 2b631dd2: (-s ours) am d23bad5d: Merge "Revert "Relaxing Korean formatting patterns so that national prefix is no longer dropped."" into ics-mr0

* commit '2b631dd217a0267fc8a749119bb45bb95b542501':
  Revert "Relaxing Korean formatting patterns so that national prefix is no longer dropped."