commit | 00269b5b4ca286902bb52af15cb1515c8720de92 | [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 | 3130f726fddd4ffca6ef3ae8ea6951081c59d379 | |
parent | 3f59476696682eaa82b06803fbaf68c7a3bc2c23 [diff] | |
parent | a9c58be1974512b8a0b26ace7e5d2027070c7f92 [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