tree 283c26baaa91bfb865a2bbe61c1df43ad24d8f81
parent e5ce848c691798e1397ce6bef8dcbda7a93e54e7
parent 2ba5c50524b3dc01ce0189cae1d803d2181cc746
author Bill Yi <byi@google.com> 1471294328 +0000
committer android-build-merger <android-build-merger@google.com> 1471294328 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dev am: d1628307b0  -s ours am: c1189dba33  -s ours am: 8996236eb1  -s ours
am: 2ba5c50524  -s ours

Change-Id: I12eda522204123228d76edd0f319b36c96b512a0