commit | b629fd454e3821e960c9bede08df7767c0def79f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 23 15:44:59 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 23 15:44:59 2017 +0000 |
tree | 30ca740b61dce8320252ccfd42b03881bba2796c | |
parent | 8d4a4bf0aedfee7592dcb3ba49ea4df55cad61cd [diff] | |
parent | 516b3e719527b214329f6d596939f6165bb347a8 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: b39c08f9d7 -s ours am: 3cd12a1ca7 -s ours am: 516b3e7195 -s ours Change-Id: I60f074c5eb4cd1d50ec22a9c1860e84e6f2d4bfe