commit | 0abf781635a2953a6dd8ffd8a57a84f65fcace5c | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Dec 12 16:48:13 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 12 16:48:13 2013 +0000 |
tree | d8d2a645079e7e380315ac3c207fbaa967c7340b | |
parent | 30728acaf53baf154f2d709e60686cfa58e5f99d [diff] | |
parent | 478e318362e564c7a06dd3d16f315a4c5753ea45 [diff] |
am 478e3183: (-s ours) am 63f898ac: (-s ours) am 299926e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '478e318362e564c7a06dd3d16f315a4c5753ea45': Import translations. DO NOT MERGE