tree d49926f85e5f332e61fe1d063f3d68ac79427a95
parent 7ccd75891257df73d27b423ce168b72336d8a6af
parent edfbaa6c8d62e700f47903d691d6e96c4475c25c
author Baligh Uddin <baligh@google.com> 1381503958 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1381503958 +0000

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