tree 3e24d239c47449a1833ce81ec3bba9b164940e0c
parent 424418bb50ccf5d9270650b70cc51f423da51a65
parent 820d6057bd1c93ecbf5557dff15e518ea6fffc16
author Baligh Uddin <baligh@google.com> 1409157115 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409157116 +0000

Merge "Import translations. DO NOT MERGE" into ub-now-porkchop