OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 445abdc ff4e02a)
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)
* commit 'ee1b497648a0c3c03b09c4739619f23315d491fb':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help