| commit | 8017bac6238f7128f97d431b05110c25ebe2de82 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue May 13 23:48:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 23:48:45 2014 +0000 |
| tree | 967f2714b7c695a2c8690d8099672ae2c639bbb8 | |
| parent | e3b0f9555309228a389475f350fa167db801c373 [diff] | |
| parent | bbf77e58274e0cfc8d03a0b103c6f9526445ec14 [diff] |
am bbf77e58: (-s ours) am 9e02b428: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'bbf77e58274e0cfc8d03a0b103c6f9526445ec14':