tree 92a9d0605f756187ce73f22ef8164c90ce39c56b
parent 63915da8670328459688e358266a528ca3bcd7a2
parent 12460014fb72de1e5bb460ab59109e6aa76a547b
author Baligh Uddin <baligh@google.com> 1446751934 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1446751934 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master