| commit | b89db8ca49c973b83730d81bf309112e42207ff5 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 23 10:33:16 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 23 10:33:16 2013 -0700 |
| tree | 2432aee3e69979303ae430b6c6644588f826332b | |
| parent | 979ebd1458396a84b1f373959ac8bccf73e2ea31 [diff] | |
| parent | cde128ff436db88d3b89c09e1046cdd59edc04eb [diff] |
am 6cfb3f93: (-s ours) am 0f49d40e: (-s ours) am 9922002f: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '6cfb3f9379c3d4e16255d5a3b95a07a50988d319':
