commit | ec851bc0f9e3b0c225fa27a22b9e8d0df1418886 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Dec 09 12:18:48 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 09 12:18:48 2016 +0000 |
tree | 865854944f09af1e41a3452acd80ecaa0cb2cd1b | |
parent | 201f5a7ff7dd570739c414287f61061654aa278a [diff] | |
parent | b28dedff56273ba39e70f13d702310fd72c065cd [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 1e40ddc47a -s ours am: b28dedff56 -s ours Change-Id: I42fa2adcd8731649f412d5044e94bf4b0c55299e