OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e875c3 9bbc6b0)
am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into...
authorXavier Ducrohet <xav@android.com>
Tue, 7 Jun 2011 22:09:31 +0000 (15:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jun 2011 22:09:31 +0000 (15:09 -0700)
* commit 'ab3f5779aecb46d7ddfb141f9b0ff8fc0eaed17f':
  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