commit | fe23c2afbbdf7cc7e0101b65597945d033733bc3 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Apr 13 16:06:46 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 13 16:06:46 2017 +0000 |
tree | e5edb0787cfdc704137a794920c06aad27b82749 | |
parent | f5ce5e822eb78339cd673d9fbfc4138c547c6f63 [diff] | |
parent | ca2721f9bd060ede84d3e913bfba2cae4e52a398 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 2f522fc904 -s ours am: ca2721f9bd -s ours Change-Id: I827bb1a6d767d29c53af7cbe069f4f6206fd24bd