| commit | 0da23c79e4725d2568b495ada524b59eac188b97 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Apr 29 19:17:11 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Apr 29 19:17:11 2017 +0000 |
| tree | 844b82514c02da97684c1486c507163dbad132bd | |
| parent | 1e07905467272040c7636e6036fb06ee0d975b7a [diff] | |
| parent | 5a4a417a665eec7d45aef46101cfaf63003cca50 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: d95344d8aa -s ours am: 5a4a417a66 -s ours Change-Id: I1a92dc5898143cfeee830c77905bdc91fd05f1ac