| commit | 374c1bc10ac4976f5d2f6cf0d13fa270fcd84905 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 14 14:28:36 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 14 14:28:36 2012 -0800 |
| tree | 5eec4c2e4165e67a8dc85683ee9a6ae3cec56594 | |
| parent | 54d9fc2830fd770e58aa73af5238bda7512d3cfd [diff] | |
| parent | e61d6d2d8f91dfe570d4cba60b365c418dcc0fb9 [diff] |
am e61d6d2d: (-s ours) Manual merge - DO NOT MERGE * commit 'e61d6d2d8f91dfe570d4cba60b365c418dcc0fb9': DO NOT MERGE