OSDN Git Service

am e1d14a29: (-s ours) am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9...
authorXavier Ducrohet <xav@android.com>
Thu, 9 Jun 2011 16:04:26 +0000 (09:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jun 2011 16:04:26 +0000 (09:04 -0700)
commit82dd50b3d638f6ab8ddfdde7a796413371893b00
tree713706e3b687bb494c536ef68d1314634302de9f
parente3f2baa793d194bfb104e5d99a1cee4fe51d418b
parent1c144773d2450058019d54798b6db0f5a4c22e0b
am e1d14a29: (-s ours) am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread

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