| commit | d05c9763bcbd5b2c0a6018e90cf41c1d75cb4ec4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Nov 09 22:44:28 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 09 22:44:28 2012 -0800 |
| tree | 04f9644f77dc72a443c456941ef9b628873ed763 | |
| parent | 4bbbfecffa16b00e3b1419603d20c46a88141df6 [diff] | |
| parent | aa29e48b2b711a2bf39666c8ecf108fc9c54de05 [diff] |
am aa29e48b: (-s ours) am ff87960b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit 'aa29e48b2b711a2bf39666c8ecf108fc9c54de05': Import translations. DO NOT MERGE