commit | 4f8986e7ac40a49e574bb02635b971b265ac19fb | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Mar 25 19:04:30 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 19:04:30 2014 +0000 |
tree | 7c67abb754a48610ecfa88fb3dadaa3626211644 | |
parent | 6babdc36cff3321281295b79ca6985e27f8fdb7f [diff] | |
parent | 8129716e669434a784e48c9f10eb5b68c622d000 [diff] |
am 8258f111: (-s ours) am 904dde27: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '8258f1117b8860f0528af09d136715f78d799532': Import translations. DO NOT MERGE