| commit | 2bda60ec21ddfefc3c43cb3ab999e858341880e9 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Jul 01 17:08:41 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jul 01 17:08:41 2017 +0000 |
| tree | 6ec3564d75a51fc93b058cc9bb8cc69f629a5cd9 | |
| parent | 8423fde37b498124237926b6bf8f96b8a4bc5151 [diff] | |
| parent | 0e0b89a3e94a5d70bcca4debc1082408da1c722c [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: c393596c5c -s ours am: 0e0b89a3e9 -s ours Change-Id: I07267b6b14b2f96fc1321d003b19f5138808fd73