| commit | 1f09691a041b4b0e856ad0ac8ba8b0931ecee469 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Mar 25 14:36:53 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 14:36:53 2014 -0700 |
| tree | d005f7092bdea7c123c548628286905850157b84 | |
| parent | 2deb919f938017bce885dcab163e169d81b5ec55 [diff] | |
| parent | fde758062c2591fe823f0b1214dafbff220eb9ed [diff] |
am fde75806: (-s ours) am ff995d4c: (-s ours) am 54ff084b: (-s ours) am 1ec23cf6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'fde758062c2591fe823f0b1214dafbff220eb9ed': Import translations. DO NOT MERGE