commit | 01d103e68436271184178a1df45527f6b9592fbc | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 08 22:52:21 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 08 22:52:21 2017 +0000 |
tree | a4ed5d0b1b7d9efa0ffd33b4af247ccb006425d7 | |
parent | e4f07b2cb66048510c93d21870a2300e40acdd77 [diff] | |
parent | 5679e1cc6ee612f5e5e6f38d7dc5f09ca0330565 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d -s ours am: 5679e1cc6e -s ours Change-Id: I62d5eaf20549840c1a4adab9f247b292e3505159