| commit | b5853c74531cac635cb888185129093a8dee7b1a | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 27 22:26:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 27 22:26:38 2014 +0000 |
| tree | 16dca674c5e87a35f9687d337f16ee92bfade1cf | |
| parent | 433ee012363e86d9e2111684989b862bc952150f [diff] | |
| parent | 7e90512771943c2b87d96bba8a90e80eb26c65a7 [diff] |
am 7e905127: (-s ours) am de11c260: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '7e90512771943c2b87d96bba8a90e80eb26c65a7': Import translations. DO NOT MERGE