| commit | 3f76500d39d1cd08f3cd2e1379c7f61597978fe0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 18:44:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 18:44:43 2014 +0000 |
| tree | 6398c5fc86fba7e13e3b3eda6d3494ae40e81404 | |
| parent | 2f39b333a32f9849bf174e3ea8b3d552e11e372c [diff] | |
| parent | 000bd2527105f0bdf825a65cbf82a1133d1e0bae [diff] |
am 000bd252: (-s ours) keep history after reset to a03388cf9a9bcd78400b6f79aa360a5d1e71c7ac * commit '000bd2527105f0bdf825a65cbf82a1133d1e0bae': Import translations. DO NOT MERGE