OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1de1a5f 471ae8e)
am 19fa6d45: am 738a0460: Merge "Don\'t inflate the zoom button controller until...
authorGrace Kloba <klobag@google.com>
Tue, 20 Apr 2010 18:47:31 +0000 (11:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 20 Apr 2010 18:47:31 +0000 (11:47 -0700)
Merge commit '19fa6d4586df8ff7897fcc73b2228b431502d58e' into kraken

* commit '19fa6d4586df8ff7897fcc73b2228b431502d58e':
  Don't inflate the zoom button controller until we


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