| commit | 53613f42dd229afaad63786d5e5f30a970fdcac6 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Feb 20 23:15:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 23:15:48 2014 +0000 |
| tree | cd2cd0862548f1d9c3ae27dfafe1e38e11a21b0f | |
| parent | 9fc2c087bcac43e26adf1d730918d3a2b9b9f07d [diff] | |
| parent | e219163b32edea8bbde6cdf990ed5a141496c693 [diff] |
am e219163b: (-s ours) 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 'e219163b32edea8bbde6cdf990ed5a141496c693': Import translations. DO NOT MERGE