tree 31250cca830480fade1ff7c3fc0f44ed290332f7
parent 2817d682ab982201a0f1f7005f3f41e6b5d2bf83
parent 458f43b55061f974c7cec1786fe6333bcba790e4
author Baligh Uddin <baligh@google.com> 1353611002 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1353611084 -0800

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