| commit | b23d4088cbb2fdb067999f94ce67ea9976bca500 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 11 08:22:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 11 08:22:25 2013 -0700 |
| tree | 93c055f3b0526757d0b9db43d242bc9401126f30 | |
| parent | 24c4f55bac0a5b7a4737513c8178aa4299173f86 [diff] | |
| parent | 7054f6e3c0f89dbd0b158b8fe0bd6b2b5c008f41 [diff] |
am 7054f6e3: (-s ours) am a60212ab: (-s ours) am d010f7a3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '7054f6e3c0f89dbd0b158b8fe0bd6b2b5c008f41': Import translations. DO NOT MERGE