| commit | 36465c781519719a91d12bbe780db1180c06df57 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Nov 09 07:45:47 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 09 07:45:47 2012 -0800 |
| tree | dc538e4f156da0107748612e3449ec4768170a62 | |
| parent | ad96d5ced83767bf3ee821dbd5702a0fee4d4095 [diff] | |
| parent | e499803e82160f9fd8604ef295ed5d82a4db829d [diff] |
am e499803e: (-s ours) Re-merge translations - do not merge * commit 'e499803e82160f9fd8604ef295ed5d82a4db829d': Re-merge translations - do not merge