tree 8c45788a0a1b0548a46667bd10112e54c1d4b693
parent 314bfe071011cc16d56a9c8bfb65000cd3597bf0
parent 2acb2b102aa3267301b7c97b490f0939f58d2593
author Baligh Uddin <baligh@google.com> 1404675449 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1404327012 +0000

Merge "Import translations. DO NOT MERGE" into klp-dev