| commit | be0bf47a87b2c96507d80a1649137962b9cc07a3 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 23 17:30:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:30:28 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 960d466dba2a06cf9359d5e2af8368bba3f9e37c [diff] | |
| parent | 2e9a8304302ef84191d29fa62e7f3ef00c636043 [diff] |
am 2e9a8304: (-s ours) am c7e670e2: (-s ours) am de4817e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit '2e9a8304302ef84191d29fa62e7f3ef00c636043':