OSDN Git Service

resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp
authorIrfan Sheriff <isheriff@google.com>
Wed, 2 Feb 2011 22:23:10 +0000 (14:23 -0800)
committerIrfan Sheriff <isheriff@google.com>
Wed, 2 Feb 2011 22:23:10 +0000 (14:23 -0800)
commit22e78eb934392f34c20c2abd9c40e41890480a12
tree12a552a7b5527f5337adab29948ca5123dfbece3
parent09a107d3d09d1e3d4b31a38fb44d783f163b6e76
parent907b884345116f56859432a45fa89e1e8e5e7a5f
resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp

Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c