| commit | 06b5a5a58317ae5ce2474a08771c13e4a2c410b8 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 02 09:43:02 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 02 09:43:02 2013 -0700 |
| tree | 6bfa9f922aa33b30b4c0549ae42a66899f8896ef | |
| parent | 0d215d9ceb199567dd26ac1ac14a3ad2ea466847 [diff] | |
| parent | fec60dd7ad5c6e187576ad7e7182de996a1d9e4a [diff] |
am fec60dd7: (-s ours) am 2f4ab564: (-s ours) am bf83288b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'fec60dd7ad5c6e187576ad7e7182de996a1d9e4a': Import translations. DO NOT MERGE