tree d25796d164635e85289d1127d657b7947869f51c
parent ff4bc86cfbc5a2304a816ca4742468073e8783f4
parent ee0f6e4e14aea1bee455771d8d8bedccedcf0cef
author Baligh Uddin <baligh@google.com> 1366669202 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366669202 +0000

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