commit | fd050e32c5a7a2f3669542f4c64b0fad8b4efc4d | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Oct 11 08:22:43 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 11 08:22:43 2013 -0700 |
tree | 93c055f3b0526757d0b9db43d242bc9401126f30 | |
parent | a6aa9bda768fbe910150e03892746ab00f8cf2f3 [diff] | |
parent | ce76c4341b34e4122c72435aa1e3123b94e83045 [diff] |
am ce76c434: (-s ours) am 9aa75f29: (-s ours) am ccfd6f44: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'ce76c4341b34e4122c72435aa1e3123b94e83045': Import translations. DO NOT MERGE