| commit | 696601704ecfc23d9f8e4e184b2a78c049add6d7 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Apr 04 14:37:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 04 14:37:25 2014 +0000 |
| tree | 915a1df70197f122c5fcfce34097dd39490ed401 | |
| parent | c71d89a8268cdc445b1b07e9f5a97372f8593629 [diff] | |
| parent | 87210ee9621829786516f52fc45dfeabd5daec0a [diff] |
am 87210ee9: (-s ours) am b2856041: (-s ours) am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '87210ee9621829786516f52fc45dfeabd5daec0a': Import translations. DO NOT MERGE