| commit | 700ea8bb7b9ee8ef20482475813c76aabc2d2943 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 19 22:44:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 19 22:44:05 2014 +0000 |
| tree | 35177ce3c6cf8d873ea0f220bd9dc71fa69105f3 | |
| parent | 6dc1b19b8ee32dabf8726bbdde35156fa9ae7673 [diff] | |
| parent | 6912dc5f33e152e3a0d6b8561dcf8cbcd5a4056c [diff] |
am 6912dc5f: (-s ours) am ffd0f4d5: (-s ours) am 6f1de7e5: (-s ours) am cf1c95ec: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '6912dc5f33e152e3a0d6b8561dcf8cbcd5a4056c': Import translations. DO NOT MERGE