| commit | 62193c681aa94a9ac0cb1742f249dfe85bc3c395 | [log] [tgz] |
|---|---|---|
| author | Brett Chabot <brettchabot@android.com> | Tue Sep 21 15:47:33 2010 -0700 |
| committer | Brett Chabot <brettchabot@android.com> | Tue Sep 21 15:47:33 2010 -0700 |
| tree | 88230684ac3bcdd8d9d5a82a8cb636db10dc9346 | |
| parent | 865bf1f4dcc5d69793dfb7ffd71aedb6aeea37b5 [diff] | |
| parent | 5e83330bf7d2d2128362f407ab9f32f1dec95868 [diff] |
resolved conflicts for merge of 5e83330b to gingerbread-plus-aosp Change-Id: If44793ba6eb8d9a04bf41a95dee2d709d033fe8b