| commit | a21bec13357c02f5964e93aaec444f620bf83f60 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Apr 02 07:53:03 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 02 07:53:03 2013 -0700 |
| tree | 35305b37a2672328968425846ef83ec35f97c0fc | |
| parent | b4e2a3bb4ededabce573e90fe0d82dda0fb2d8cb [diff] | |
| parent | 30667266dd48326388ae3e2a62429d5766211bfc [diff] |
am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce8b15902a055f802c6b6057b216063b - do not merge * commit '30667266dd48326388ae3e2a62429d5766211bfc': Import translations. DO NOT MERGE