tree ef6fa25cd170c5bb09beaad9436c35e8f5f979d9
parent d80697c1ad2cc75600a73a97e2af2c85ec60af9c
parent 15ae8e5c5532e27a1fd5c909cc3a38a4df1d50b0
author Eric Fischer <enf@google.com> 1318963620 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318963620 -0700

am 15ae8e5c: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit '15ae8e5c5532e27a1fd5c909cc3a38a4df1d50b0':
  Import revised translations.  DO NOT MERGE