OSDN Git Service

resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Mon, 11 Jul 2011 18:20:12 +0000 (20:20 +0200)
committerDavid 'Digit' Turner <digit@google.com>
Mon, 11 Jul 2011 18:48:41 +0000 (20:48 +0200)
commit36331f8455822539fe4fbb0a25fbc377bbc80a89
tree967e499e9ada45ab6245cf7b84b9275648a96627
parenteb0a62cb26d7bed289df823e2d68e422c39b5659
parent09636e177160821ba018297e8127b4e6109e7b6a
resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp

Change-Id: If2b21def45b5de222e560af442a0ff9f56da5a35