tree a4806fca16d22780237a4c61b14638afdd508586
parent db983fa7c46da75469d0042425b41f84b5cdc9ac
parent 339308c1e0237454eb28763723e99dfc9b0b3a78
author Baligh Uddin <baligh@google.com> 1349928897 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349928897 -0700

Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev