OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a0da64 d92740b)
am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars in layoutlib the same way the...
authorXavier Ducrohet <xav@android.com>
Tue, 7 Feb 2012 00:44:32 +0000 (16:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Feb 2012 00:44:32 +0000 (16:44 -0800)
* commit 'b1f95c6a938f6eaaa7a3fd28574a14647178059b':
  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