| commit | b114cbd4c1ae18b9026a9fb528cc230760a5c148 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 04:15:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 04:15:22 2014 +0000 |
| tree | 8152e8fff6922e473b33d69e79cdc1f27eb62fb9 | |
| parent | e6274e3fb51e14b382064e5142453b722d87789a [diff] | |
| parent | 829cdf188112199399f87c4f3da6e5ee57f3df7b [diff] |
am 829cdf18: (-s ours) am 2319a4de: (-s ours) am 4ae16a51: (-s ours) am ea2d4258: (-s ours) am f1bc3d1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '829cdf188112199399f87c4f3da6e5ee57f3df7b':