| commit | ecc47ce16fceba94f150ff02f7c3ad7f2aa8404c | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Mar 14 10:02:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 10:02:46 2014 +0000 |
| tree | 1b252b6495e62dae7a3210cfbc19b2c41c13d41f | |
| parent | c4fa3a727bb66e36ba0a321e5c3273c09583c341 [diff] | |
| parent | 4323f74aa197701b7b1ea8c45993f57563208810 [diff] |
am 4323f74a: (-s ours) am 5969801c: (-s ours) am a60df014: (-s ours) am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '4323f74aa197701b7b1ea8c45993f57563208810': Import translations. DO NOT MERGE