| commit | d7dcc2e787371ebcc34672fbe3828b32857e5825 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 09 12:31:32 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 09 12:31:32 2013 -0700 |
| tree | 57e49da0b90565c76a1394b8a875fc22e9ae0369 | |
| parent | 7e3f1546a29667ce7a33ae06858331b01d5afd4c [diff] | |
| parent | 83f4d7363c7e56844387675fe106f34ff836f8cc [diff] |
am 83f4d736: (-s ours) am 564269bf: (-s ours) Import translations. DO NOT MERGE * commit '83f4d7363c7e56844387675fe106f34ff836f8cc':