| commit | 949131b6605f9dafc069eb918ff003a55f72d934 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Feb 20 23:02:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 23:02:09 2014 +0000 |
| tree | b937df385a408d0709170f3f5b4252a38c22c96c | |
| parent | d87e57f6980847adeed04a6795e28b26ec4008e1 [diff] | |
| parent | 17b7705afb3e36a6239fdcc3fadfa6601f32fe98 [diff] |
am 17b7705a: (-s ours) am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '17b7705afb3e36a6239fdcc3fadfa6601f32fe98': Import translations. DO NOT MERGE