| commit | e1d14a29ff9aa17923dc4e9406408cbc07a97c31 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Jun 07 15:09:31 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 07 15:09:31 2011 -0700 |
| tree | ddc2c6aeb57081564399f9a69b6432033300967c | |
| parent | 34e9f249a9b36ebe64476b997bca0edf990fbc0d [diff] | |
| parent | ab3f5779aecb46d7ddfb141f9b0ff8fc0eaed17f [diff] |
am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread * commit 'ab3f5779aecb46d7ddfb141f9b0ff8fc0eaed17f': Cherrypick 5b61ea6b from hc-mr1 LayoutLib: enable the LAYOUT_ONLY capability. Merge dba35f1b from honeycomb-mr1. do not merge.