commit | 73a634ce2fb53f04227087db9723470863328ac4 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Apr 21 16:26:39 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Apr 21 16:26:39 2017 +0000 |
tree | fc1c62d00b1932215cbeebdfd89115daf53cff8a | |
parent | d45d8a89c84ce05f2347ba9dee3e37640f3ad7ad [diff] | |
parent | 97c12deabb62a1f74594f62ab3b650ba74582409 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 03150c4a29 -s ours am: 97c12deabb -s ours Change-Id: I4478c1637241a89f668dfba9747fc6c488026141