| commit | 871322653c4109a9640b56374a246120c65f8241 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Apr 04 14:45:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 04 14:45:45 2014 +0000 |
| tree | 0d71caa090a7cf0df092655b2d4a1a744d10aca6 | |
| parent | 44e3e56fe20c2fc59d90b6ef6564458cffb1efa7 [diff] | |
| parent | 3f3469aecc1da8bf72482ddae53e11d0245fddd9 [diff] |
am 3f3469ae: (-s ours) am cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '3f3469aecc1da8bf72482ddae53e11d0245fddd9': Import translations. DO NOT MERGE