commit | a2571fee717735aeab45821baa1af2162040407d | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 23 19:33:40 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 23 19:33:40 2013 -0700 |
tree | bffe732b029a1838e529349dd83be6a5a4e6c997 | |
parent | deaad328df2b155cdcc91dd45daaecf81fa6845c [diff] | |
parent | 215f2f83f17670a954dcff48d1cf821f6e0b5df7 [diff] |
am 215f2f83: (-s ours) am da13330d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '215f2f83f17670a954dcff48d1cf821f6e0b5df7': Import translations. DO NOT MERGE