| commit | 9a3a3db19cc97307fbaa7a9e61204b359db026ad | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 27 18:51:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 18:51:24 2014 +0000 |
| tree | 35177ce3c6cf8d873ea0f220bd9dc71fa69105f3 | |
| parent | 9d883f2e84d3fc721a45774f5efdafb9b7286dca [diff] | |
| parent | 79d81b58dd4166b46e43849979d7eca2c5f8ccb8 [diff] |
am 79d81b58: (-s ours) am cf1c95ec: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '79d81b58dd4166b46e43849979d7eca2c5f8ccb8':