tree ce4df4cefa2a69231ecc47cac0caec9909e126a1
parent 5ac904321d81a0a0b7892c5722c464dc3c693f9f
parent 586376a03612669fe76a0b8ebfd872c2cb2c6d21
author Baligh Uddin <baligh@google.com> 1370040218 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1370040218 +0000

Merge "Import translations. DO NOT MERGE" into jb-mr2-dev