am 2c94d797: (-s ours) am e59ed199: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '2c94d7974e8bdcae01f421874ab952f462449b53':
  Import translations. DO NOT MERGE
This commit is contained in:
Ying Wang 2012-06-18 10:52:45 -07:00 committed by Android Git Automerger
commit 6e2b329705

Diff content is not available