tree 8bdc9e5eedefcfb44ee6e87c13faf300a3512016
parent 170105d749863f67503b75738b3d8f21519b761a
parent 38493608679373c2c4840905802f06e69bc6ec40
author Bill Yi <byi@google.com> 1470420239 +0000
committer android-build-merger <android-build-merger@google.com> 1470420239 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 3849360867  -s ours

Change-Id: I5d66dc9cf67c898b116aaf78a5678c44be5d147a