commit | bd36ee3b77c18de72acb08cc5e88a14efbb3e08e | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Nov 21 02:01:13 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 21 02:01:13 2016 +0000 |
tree | 2406fe8280cf92fb931fa11c7e69e351249326c5 | |
parent | 175d2b284803e355eff0443c596808ac23ace984 [diff] | |
parent | bbdb6e79baf0f0b61af20c81dc0bcbbb12bf6404 [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a4c8fe82e8 -s ours am: bbdb6e79ba -s ours Change-Id: Id7310c450c4bf6174ed43f6ce88d86bf5c2720f1