| commit | 5d33c7663eada923d164947c269bef339b6caa14 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 21 17:05:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 21 17:05:59 2014 +0000 |
| tree | 77ae6dc696eb7f2942e6d5bfebdccb95eebf8a6e | |
| parent | a9ab2a62dfad586b4ea307321b6330bdc468497b [diff] | |
| parent | 0f591c64ff895363f5b02521cd02648463d1062a [diff] |
am 0f591c64: (-s ours) am beaa8a47: (-s ours) am 5df8b427: (-s ours) am aa8f178b: (-s ours) am cd2a75b5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '0f591c64ff895363f5b02521cd02648463d1062a': Import translations. DO NOT MERGE