commit | 78605970cf25ee50858dc6f33a5a55bc72ad0440 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 02 09:52:05 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 02 09:52:05 2013 -0700 |
tree | bdfa83371b43f1c1d7ceb6474970701026fa479c | |
parent | 61991b0bf9e46f8f311b134bd7f7c8a44c7ee671 [diff] | |
parent | 6a117ffc663a690d87815ddc86988a6d7c0a4897 [diff] |
am 6977a628: (-s ours) am 59bde219: (-s ours) am 198cc845: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '6977a628930975645e53b80d5155630163bdd9d6': Import translations. DO NOT MERGE