OSDN Git Service

resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Wed, 11 Aug 2010 18:51:31 +0000 (11:51 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 11 Aug 2010 18:51:31 +0000 (11:51 -0700)
commit42b42be2cd47a206af6935b1a834218e3b501791
treeec2afb48cfbf0958ca5fbc29f6a00b72b9a9ad68
parent41499c01eb75278fc222b9afd32aca99abd08f20
parent3476cbb432879e05cb9afeeae2605d16b254ff61
resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp

Change-Id: Id6bd5ab1d6eda0372f2fd8eecb8f1d204066c4d5