commit | 09dca1245a80039233d5ed763ff127ef99d15b6c | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Apr 30 14:05:22 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 14:05:22 2013 -0700 |
tree | e4eab34b50299cabc52491e20d607f70acfb5fbf | |
parent | b84fcc46b21cb4ecd161d7faeeac53292ec148dc [diff] | |
parent | b8ae4863d726bd925f850ef4145d0ec2dbd8bcd5 [diff] |
am 902fd54c: (-s ours) am 741a8156: am 1fe84a2d: (-s ours) Import translations. DO NOT MERGE * commit '902fd54c217312565337dbc735842f60389801ee':