| commit | 38c068128df0657cd69605f909db06e8faec30f4 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Jul 27 03:07:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 27 03:07:56 2017 +0000 |
| tree | e601819025412b76d21724e51f2d45c4aca70c51 | |
| parent | f4ec2869f2e5e9114b162e2950db2da3d8177fff [diff] | |
| parent | 972d146ca79266054920f6d515ec469218ca9174 [diff] |
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours am: f417f591a1 -s ours" into oc-dr1-dev-plus-aosp am: b99a5acab9 -s ours" into oc-mr1-dev-plus-aosp am: 972d146ca7 -s ours Change-Id: I6428a1b0694c86f66087dbac450eb5325337369d