| commit | fc09c05eabadf6e4d82211c9b507da737b6e20c2 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed May 14 00:07:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:07:27 2014 +0000 |
| tree | c2175942e3a631ad112fe6ab17da560c45fc1ae2 | |
| parent | ee261c8becc98a1b7efa5d59abad82c31cdb5cae [diff] | |
| parent | a93f8afab3952d6e6c820cc6c59f5899ff2f570c [diff] |
am a93f8afa: (-s ours) am 7b7476fd: (-s ours) am 47467f86: (-s ours) am d601e973: (-s ours) am 61365506: (-s ours) am 366822da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'a93f8afab3952d6e6c820cc6c59f5899ff2f570c':