tree a4806fca16d22780237a4c61b14638afdd508586
parent f8a49f869d6d0303998e8483ca7f650a0d4e5963
parent f371a36e2ec0efd2bf76de452d7e56f762525db3
author Baligh Uddin <baligh@google.com> 1349928877 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349928877 -0700

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