| commit | 46193e32d9704c3346171ab50d74fa8d8e343566 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Nov 05 13:27:16 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 05 13:27:16 2013 -0800 |
| tree | 02cbf8421d6b998bf76e2b5b75cde48fc7904f41 | |
| parent | 13b76ad07b59897215630c133001b519d5aa69e9 [diff] | |
| parent | 24e1595c642b828efcfad65e83767fbd5423e76f [diff] |
am 584b1cc0: (-s ours) am 0bdaa9a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '584b1cc07324244e2b1c1f0013a8a67b4a87fa04': Import translations. DO NOT MERGE