| commit | 7766db872637c0b3afc5a962c6a4f1359b0ddb4a | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue May 29 11:55:57 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 29 11:55:57 2012 -0700 |
| tree | aec75c65387603b2829014c0ac811bc204db0a43 | |
| parent | a520958386c47a9a434c80d54b6d75e2023e766d [diff] | |
| parent | 78620a76995de7070c4ac4cc2132b043727c38cb [diff] |
am 78620a76: (-s ours) am 2b08c897: Import translations. DO NOT MERGE * commit '78620a76995de7070c4ac4cc2132b043727c38cb': Import translations. DO NOT MERGE