| commit | 1c42269cb35beda3110bb441b6fba25cf736cf12 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 18:39:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 18:39:57 2014 +0000 |
| tree | 6cc922b18cb72799525218d64e5dcb4757b03131 | |
| parent | 1131029184bbcc31695250444267a9f3bfbf0f08 [diff] | |
| parent | 476a40e33243c7c86859aa7fbadb8f24c0c32d3b [diff] |
am 476a40e3: (-s ours) am f643d529: (-s ours) am b4600e79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '476a40e33243c7c86859aa7fbadb8f24c0c32d3b': Import translations. DO NOT MERGE