commit | 3e86438ee953c6ea8f67e42bec68fa426868f386 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Feb 16 15:39:10 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 16 15:39:10 2017 +0000 |
tree | 28871dc1b9a5dc4e5b65d245769692094c14575d | |
parent | c75969805acd502d91ef7c33356d769b9f98535d [diff] | |
parent | 2b8164620fdc18a8b7bba5854c64d6fc62e308a1 [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: ea62e92c27 -s ours am: 2b8164620f -s ours Change-Id: I14e677d8e0ebe7a4dd11885698154ea130df701c