tree 3049c29e00dacaf9028595361dcd03413231888f
parent da1a10f727746f9f85c576adb2c4c91c552255f3
parent 43ca5efaf0bfbf48f8bada3446615ff8b79530bb
author Baligh Uddin <baligh@google.com> 1398177988 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1398177988 +0000

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