tree d1f8556c4c9e62aa29c02c037fbab9d206600270
parent c9c953da03347d96701a1e29f22e675ddee94d15
parent a2d4c80774ff0f47742d5e89a745028ec78d997e
author Eric Fischer <enf@google.com> 1316215456 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316215456 -0700

am a2d4c807: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-factoryrom

* commit 'a2d4c80774ff0f47742d5e89a745028ec78d997e':
  Import revised translations.  DO NOT MERGE