| commit | 1131029184bbcc31695250444267a9f3bfbf0f08 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 18:39:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 18:39:53 2014 +0000 |
| tree | 6cc922b18cb72799525218d64e5dcb4757b03131 | |
| parent | 777dafeda862514b340a7014a2603b1c61c3a14c [diff] | |
| parent | 2353a8fc5da7402e7bdd0b6eb54edb583fe27f8f [diff] |
am 2353a8fc: (-s ours) am 2f689434: (-s ours) am f599be53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '2353a8fc5da7402e7bdd0b6eb54edb583fe27f8f': Import translations. DO NOT MERGE