tree 3e896131b6d551c8c3cda55632c4a2f7a5d6a2b4
parent 64f0f284a90b5273f0d659e8e23aebb569dfe237
parent 38002e3b11f9eccac5117af48a7399f2edd6d877
author Eric Fischer <enf@google.com> 1301433330 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301433330 -0700

am 38002e3b: am 001a1458: (-s ours) Import revised translations.  DO NOT MERGE

* commit '38002e3b11f9eccac5117af48a7399f2edd6d877':
  Import revised translations.  DO NOT MERGE