| commit | 4ad80dcffd4b5a57545157742642b802f7d15b15 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 18:49:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 18:49:39 2014 +0000 |
| tree | ab136585e8eddafe7551a8a64e7446d09e709079 | |
| parent | c2249a1af425aadc27ad7c024a58351eeaef273d [diff] | |
| parent | 5ac6a47f25f603af68c2cc222d2713aea187b2f8 [diff] |
am 5ac6a47f: (-s ours) am de9bfb79: (-s ours) am 8e1bf9f1: (-s ours) am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '5ac6a47f25f603af68c2cc222d2713aea187b2f8': Import translations. DO NOT MERGE