tree a892f050ed90ceabb3e6ad69623c22058434b6e7
parent e05da947dc399b1077010a91ee68c71e417d2d20
parent 71556ef0e43cf5fc2ef84626c84f1e2caf52b843
author Bill Yi <byi@google.com> 1465908049 +0000
committer android-build-merger <android-build-merger@google.com> 1465908049 +0000

Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 7ce75172dd  -s ours am: 31e9b4c8c7  -s ours
am: 71556ef0e4  -s ours

Change-Id: Ibfe82d158a295eeab838a8271ce631f712205fd1