| commit | 1c144773d2450058019d54798b6db0f5a4c22e0b | [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 | aa30a4379194cdb17d0ba95405b471499b23bcb2 | |
| parent | 3e875c38918ea5a37c73b084a4b29efcb0d143f5 [diff] | |
| parent | 9bbc6b05286b8a64c99dc82fa1b61da6a99c8255 [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.