tree 5bc4d44e48c5569cb059e708a3e8df016c11d164
parent 333068ee7375aa210477c73dc8fbbee00ca97214
parent 527e5a4a5edbc8ecf9baf301be3eccbaf39d7507
author Bill Yi <byi@google.com> 1483109848 +0000
committer android-build-merger <android-build-merger@google.com> 1483109848 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c0febc48e8  -s ours
am: 527e5a4a5e  -s ours

Change-Id: Ie5b9d854236bdabce810d3407d9e1604fd3eef25