commit | 0deb8ad6b2374b49012d35a91df105d06c1c0991 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Mar 25 21:21:18 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 21:21:18 2014 +0000 |
tree | 3ba8e2b290df5e7270380da9e9437f8ccf7280c4 | |
parent | a0eeb5e1720154bc11a6b1b96e9694cce599762b [diff] | |
parent | fbb3ae6ca69b3c2ee490fdf4471207627d7eafa7 [diff] |
am fbb3ae6c: (-s ours) am cdd07216: (-s ours) am 27f67d25: (-s ours) am 29526cca: (-s ours) am 89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'fbb3ae6ca69b3c2ee490fdf4471207627d7eafa7': Import translations. DO NOT MERGE