commit | 76e3de47b6f7a7be0a37e0ffc0931392fc4756ba | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Mar 27 22:33:48 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 27 22:33:48 2014 +0000 |
tree | b872cf3ca90f90fc23e5a93dd3f4885aec557676 | |
parent | 4c4355fd4c628eafadce18e8cc5b07d94c97f685 [diff] | |
parent | b5853c74531cac635cb888185129093a8dee7b1a [diff] |
am b5853c74: (-s ours) am 7e905127: (-s ours) am de11c260: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'b5853c74531cac635cb888185129093a8dee7b1a': Import translations. DO NOT MERGE