| commit | 8448c8f65b6f12c9e20e264cf124f8a398cf0b80 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 09 12:32:03 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 09 12:32:03 2013 -0700 |
| tree | 57e49da0b90565c76a1394b8a875fc22e9ae0369 | |
| parent | d46cb0cd3ca94a1aad70d63b21b13ae8a7b616c2 [diff] | |
| parent | 4cdee7a61b140cf1a38b3d1eb1ac596525aa609b [diff] |
am 4cdee7a6: (-s ours) am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE * commit '4cdee7a61b140cf1a38b3d1eb1ac596525aa609b':