tree 465d24336315555870e676b137e9f4efc70c56ae
parent 67ae48f32545791fe0a0574f02bfe714e106074b
parent 9fa542a5032d8adc3f502cef0c5c98d8f10abbc2
author Elliott Hughes <enh@google.com> 1358220356 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358220356 -0800

am 9fa542a5: am 727adb8b: Merge "Manual fix for some Norwegian format strings."

* commit '9fa542a5032d8adc3f502cef0c5c98d8f10abbc2':
  Manual fix for some Norwegian format strings.