commit | 7d7fcc147704413770cf4871d8ef7d9542677a09 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Apr 30 09:45:20 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Apr 30 09:45:20 2017 +0000 |
tree | 9043216d8ae691189582856b7049efde07c16a50 | |
parent | 3b1b2b6fb09abc58dd640e63919d0ee664337a22 [diff] | |
parent | 24ffb717a0e5b863e3202a69ee32187aabc75eeb [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: c0c868e359 -s ours am: 24ffb717a0 -s ours Change-Id: I73c7832b07a9a5595d7b53bff3c2b251a40d7c24