tree 36b00db7ef13bf62e7d76b0186abe8d61c856bbe
parent 247dd6735cd4672ea9aa2a39256913e815835d9b
parent 08a65d2c5b75ac57428d7da718f3e2569f321d4c
author Eric Fischer <enf@google.com> 1298414955 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298414955 -0800

am 08a65d2c: resolved conflicts for merge of 20c7965d to gingerbread-plus-aosp

* commit '08a65d2c5b75ac57428d7da718f3e2569f321d4c':
  Import revised translations.  DO NOT MERGE