commit | bb59a881f61b71566cafd0792f284c966df3d518 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Nov 01 08:19:11 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 01 08:19:11 2013 -0700 |
tree | 3a61dd3fcdaeb8fc683023255014b0675155e58e | |
parent | 69317b7d6dc0123a7de8bcf0b2b1bf1adf6d09cb [diff] | |
parent | 9acb00ee1f2fd8cb190af290a6fe12e01e0d99c1 [diff] |
am 9acb00ee: (-s ours) am 309e27d2: (-s ours) am f625246b: (-s ours) am fcc395b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '9acb00ee1f2fd8cb190af290a6fe12e01e0d99c1': Import translations. DO NOT MERGE