OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 037cd29 e3ea596)
am c9bcd33a: (-s ours) am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars in layout...
authorXavier Ducrohet <xav@android.com>
Tue, 7 Feb 2012 00:46:46 +0000 (16:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Feb 2012 00:46:46 +0000 (16:46 -0800)
* commit 'c9bcd33afa5c34e0a49955c30aa875ac8205b65f':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.


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