| commit | c685fff9b76dd32fca96ec3a87b6c4075c668404 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Jul 02 23:19:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 02 23:19:16 2014 +0000 |
| tree | 786c3c4f6a75a9489d11bd768240473a8ef74d11 | |
| parent | ac7b1e603240a3e07375ce7c34195b4909547461 [diff] | |
| parent | 0bd94e4b7a5f490dac0090db931bef0f60121cf9 [diff] |
am 0bd94e4b: (-s ours) am 48f89343: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '0bd94e4b7a5f490dac0090db931bef0f60121cf9': Import translations. DO NOT MERGE