commit | 0f234a579cd415acb802714bd649111ee654e6ce | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 09 16:14:49 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 09 16:14:49 2017 +0000 |
tree | 6b4fa2d677819b27ed9f568ddbbadb57a9de066a | |
parent | 07c9c4483c8a92b1a3b347fb50b6fa1b48ea40b9 [diff] | |
parent | b059f0bc3d929c0512feedcb1315b6099aef403c [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 728c610446 -s ours am: b059f0bc3d -s ours Change-Id: I63dbf1618312c7a36b6d551bc4df29e24b8f9dff