commit | 430ad959853cf053c317ad256b8613e05d29f5fe | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 17 04:32:42 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 04:32:42 2016 +0000 |
tree | 71b74f73ee83ead341cd3035de763bd8f1a474db | |
parent | 6f0e8580e6c4162a97f7a6b2b3fb5fb544806905 [diff] | |
parent | 8b833b1032805e34f4d63c3662ac0bdb92fb5890 [diff] |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master am: 8b833b1032 -s ours Change-Id: I7ca415499cfa2231830e183f03a5251acdbf56fe