commit | c75969805acd502d91ef7c33356d769b9f98535d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Feb 16 15:38:05 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 16 15:38:05 2017 +0000 |
tree | 28871dc1b9a5dc4e5b65d245769692094c14575d | |
parent | 78e1375a6799df4d3e2595b8d00786bd7b1427ec [diff] | |
parent | 1d8f1bd0b2db101d324957f4aab301929cbe6b3b [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 0860f41afc -s ours am: 1d8f1bd0b2 -s ours Change-Id: Ifbb72d371976b1dd1699a84afb318f1420caa0a8