| commit | b3d5f4b8e5c69b9b2d73b3fe7cd585e3dda22502 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 30 14:04:00 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 14:04:00 2013 -0700 |
| tree | ae23c2cbf4ecbb3653722bc7f973eefc0c748a61 | |
| parent | b8ae4863d726bd925f850ef4145d0ec2dbd8bcd5 [diff] | |
| parent | b2f42f36e628314f45465865a2d6e416c5c0498e [diff] |
am 43db8085: am f351b6c0: (-s ours) am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE * commit '43db808500c47eee307815729601def90715c2b0':
