| commit | 6327a9feceb43645b9e4c187be568d82f747de1a | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Tue Oct 05 16:00:13 2010 -0400 |
| committer | Mike Lockwood <lockwood@android.com> | Tue Oct 05 16:00:13 2010 -0400 |
| tree | 24f7647674e1ffb0de3c68b7a15bd95077b95c94 | |
| parent | b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6 [diff] | |
| parent | 2f65a99fdc75dfe2fd3563fb2ce6af922da54ed1 [diff] |
resolved conflicts for merge of 2f65a99f to gingerbread-plus-aosp Change-Id: I9830756577dc6a64b03bc2be8788986d9034b059