tree 365346b4c877d12cf28507fb6c538bf130e4effe
parent 281bcdb98db1ccd14e0e175f193af927de3d528d
parent 60beeda72609b4193cdda312c368e4daf319ffa2
author Ying Wang <wangying@google.com> 1343315726 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343315726 -0700

am 60beeda7: (-s ours) am 0f76b9ad: Import translations. DO NOT MERGE

* commit '60beeda72609b4193cdda312c368e4daf319ffa2':