tree aa33538a8c1e665c3c22c2f38cc18ecf55e28141
parent 178807d590c1c873bd5eaae4c1cf331549fb6bbf
parent daf1ad0ed8fc22c258ef3fbc04d0b8359efd65a6
author Baligh Uddin <baligh@google.com> 1372737188 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1372737188 +0000

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