| commit | 78714c1edfcdefd83c03eb985d82e3d45ed7e26f | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Jun 09 09:04:26 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 09 09:04:26 2011 -0700 |
| tree | 3ac28f7a7107fbe6f5e8fe3fce1a6b430f496f39 | |
| parent | 0fbf20703f02836073567e9ad3bae401be8b3efc [diff] | |
| parent | e1d14a29ff9aa17923dc4e9406408cbc07a97c31 [diff] |
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.