OSDN Git Service

resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp
authorXavier Ducrohet <xav@android.com>
Fri, 25 Feb 2011 01:19:38 +0000 (17:19 -0800)
committerXavier Ducrohet <xav@android.com>
Fri, 25 Feb 2011 01:19:38 +0000 (17:19 -0800)
commit6043f9643771264ff6832b7367f60c50f1658952
tree2de34eaf949bd30904e7e7343a64fce86fec4561
parentadc551c0730f9aeef4ca2b156a92489044387d19
parentc806fe156007cc8b656512c85d9fa6520cc4793d
resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp

Change-Id: Ia9ad4c3b79821fef6ab8493f4c93ca58f877f9ce