OSDN Git Service

resolved conflicts for merge of 3031e475 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Oct 2010 16:23:12 +0000 (09:23 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 11 Oct 2010 16:23:12 +0000 (09:23 -0700)
commit24d6f4813b84240bb839b93f163a52a8447ff583
treeb9f691f99c0cfc15edfe6e5b955763727607734e
parent8bdbbe2de23a8a8fc26b7f3a4b7dfdbe1112ac9f
parent3031e475e1f9c7f7eacf131e37e6d4a3a929d3b4
resolved conflicts for merge of 3031e475 to gingerbread-plus-aosp

Change-Id: I8098e7e75f84d36b7a56b8033ffbaa9a1333fcec