| commit | 2353a8fc5da7402e7bdd0b6eb54edb583fe27f8f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 18:33:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 18:33:08 2014 +0000 |
| tree | 52ce1845696e788825e05127a459d7370e0efdfe | |
| parent | 5195064e8280c85fbda996df58e247e8a8509d1f [diff] | |
| parent | 2f6894345691af96d23952146bc3495758f84fbb [diff] |
am 2f689434: (-s ours) am f599be53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '2f6894345691af96d23952146bc3495758f84fbb': Import translations. DO NOT MERGE