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