commit | 6a117ffc663a690d87815ddc86988a6d7c0a4897 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 02 09:34:16 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 02 09:34:16 2013 -0700 |
tree | b6de134a971c1d286e39686f84052792369ee315 | |
parent | bdb9c2b5b63236c13e6466331ccf1ef60319c88e [diff] | |
parent | 9c1564e6cec511d505bb1959e2f286fb465e5c20 [diff] |
am 59bde219: (-s ours) am 198cc845: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '59bde219161be83711d1a8ed39c842eb9161b149': Import translations. DO NOT MERGE