tree fc863d7c20a49306aa6763046e9b74c5a7edce64
parent c4cf34dedb5fc21fce30924105729fa3dad6aa90
parent a42534f94840cb65a58a84c03d6dc63dd676b715
author Baligh Uddin <baligh@google.com> 1396923629 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1396923630 +0000

Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly