commit | d75a08beada678f0202c69f50e031359e77a43a8 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Feb 20 21:21:47 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 21:21:47 2014 +0000 |
tree | 1037a4ca6bc67618e3df05c91acc2d60fcca39c9 | |
parent | 035598eb1710e9282d54a3d17f5646525ebbbcad [diff] | |
parent | ddaf6e739041fb0cc65e08fe6866eb31e00dfae1 [diff] |
am ddaf6e73: (-s ours) am 4ee527a4: (-s ours) am 36f05fbe: (-s ours) am 09fbf351: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'ddaf6e739041fb0cc65e08fe6866eb31e00dfae1': Import translations. DO NOT MERGE