| commit | 584e9c9c22c8e54bf29db2160b72b313b93539c1 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 21 17:18:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 21 17:18:01 2014 +0000 |
| tree | e6d65d08a9053d93f1888503f53e2817accaf172 | |
| parent | 9bfa64945fba5aa038e0b9290607c73eba39e9fc [diff] | |
| parent | 5d33c7663eada923d164947c269bef339b6caa14 [diff] |
am 5d33c766: (-s ours) 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 '5d33c7663eada923d164947c269bef339b6caa14': Import translations. DO NOT MERGE