tree aa563834ef29348c3a9b6e1fe03a6ac50572e82c
parent e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f
parent e118a96fd00ffb7929d3e79d94895a8f97aeef65
author Baligh Uddin <baligh@google.com> 1462293677 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1462293677 +0000

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