commit | f5242d8a73f8b5aaec97775206dcf75ad4add8e0 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Feb 16 15:57:17 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 16 15:57:17 2017 +0000 |
tree | e7787ad5720a206882ca73501745bce4bef3cca3 | |
parent | 55f993ada6de4fc1459625dc90958a3fbcbe6aef [diff] | |
parent | fb431861f04f32680cb966eb856a1e57aeb4d219 [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: f304362edc -s ours am: fb431861f0 -s ours Change-Id: I799baf0efb73b38e7072c1dea3ba4c57dbb185eb