| commit | ee3be11f40a3500ef05bf5fceccc763aa2f8bf80 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 30 14:04:05 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 14:04:05 2013 -0700 |
| tree | ae23c2cbf4ecbb3653722bc7f973eefc0c748a61 | |
| parent | 65e7bec250e25aecc6523198eee0bd0988303d1d [diff] | |
| parent | 66e798a1daedc940fccb685a5fcae7e9b239b46f [diff] |
am 8448c8f6: am 4cdee7a6: (-s ours) am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE * commit '8448c8f65b6f12c9e20e264cf124f8a398cf0b80':
