| commit | e219163b32edea8bbde6cdf990ed5a141496c693 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Feb 20 21:24:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 21:24:50 2014 +0000 |
| tree | 1037a4ca6bc67618e3df05c91acc2d60fcca39c9 | |
| parent | 77a5fec019c5241500df41a3b1f6371a6f9bb976 [diff] | |
| parent | d75a08beada678f0202c69f50e031359e77a43a8 [diff] |
am d75a08be: (-s ours) 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 'd75a08beada678f0202c69f50e031359e77a43a8': Import translations. DO NOT MERGE