commit | 547a6b46db8651a53425ecd50d880896d95f3025 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Aug 15 21:25:46 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 15 21:25:46 2016 +0000 |
tree | 1ce39da1d4761509d9cac93bca37896a9da2873d | |
parent | 64a92f5506a94cd9aeec08f557552289b5a2ea17 [diff] | |
parent | d846a69ac5ec5bbd2766d02bfe4afb671f3f87cd [diff] |
Merge "Import translations. DO NOT MERGE" into mnc-dev am: d1628307b0 -s ours am: c1189dba33 -s ours am: 8996236eb1 -s ours am: 2ba5c50524 -s ours am: 1cd94a1294 -s ours am: c82270a605 -s ours am: 2183e131a6 -s ours am: d846a69ac5 -s ours Change-Id: I7e49997a21bec9245e2d7f7b15d6098a5813dd96