tree fd4f3a2429565e1dabb491ecad2ee95ea16e3873
parent 40cbdd2ae616121da2437b401a1b00679ac52884
parent 0ddea75be44df61b4bde5d69340e071b39e54417
author Ying Wang <wangying@google.com> 1342040450 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342040450 -0700

am 0ddea75b: (-s ours) am 04ca8e57: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '0ddea75be44df61b4bde5d69340e071b39e54417':
  Import translations. DO NOT MERGE