commit | 323dc6b0d04a54d09a3f90d454dea29eec7c5293 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Dec 22 18:11:27 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 22 18:11:27 2017 +0000 |
tree | 0fca84187fb38c96b2d49fafd1e0f60beba18aa0 | |
parent | 3fc3857a736aa3cfe986669011898569763501a0 [diff] | |
parent | cb562a40d997350e9dc0512a09a59cf7a3454611 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a8be1ae39 -s ours am: cb562a40d9 -s ours Change-Id: Iba2031a23c32e6ad748339ae7e2107bea8f80eb2