commit | 2e80195f240df4ad16b08adbc37e835d08dca047 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 23 13:29:35 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 23 13:29:35 2017 +0000 |
tree | ea3424a6e114b085aa15339b44663d9c47be9cec | |
parent | b31ae2571a60c8a06fb26c2692cfd85b17ffb763 [diff] | |
parent | 48b33e70c1d0549c12869772eda00523291fae87 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9b312998e4 -s ours am: 48b33e70c1 -s ours Change-Id: I31cb152c7349e3ae57607ea516b43c098a7ce9ba