OSDN Git Service

am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread
authorXavier Ducrohet <xav@android.com>
Tue, 7 Jun 2011 01:08:32 +0000 (18:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jun 2011 01:08:32 +0000 (18:08 -0700)
commit9bbc6b05286b8a64c99dc82fa1b61da6a99c8255
treec790c5fc8fa491fd5310bfe40fd410317fc45515
parent445abdcf8d46d1f09e6a69277471a5d07c125440
parentff4e02a89764d6f68f868b115e2631641f48913e
am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread

* commit 'ee1b497648a0c3c03b09c4739619f23315d491fb':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.