OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aeabc2a f1f24f3)
am 738a0460: Merge "Don\'t inflate the zoom button controller until we are going...
authorGrace Kloba <klobag@google.com>
Tue, 20 Apr 2010 18:43:18 +0000 (11:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 20 Apr 2010 18:43:18 +0000 (11:43 -0700)
Merge commit '738a0460c5c6b45506f5203b87d62f2ac99a8e7a' into froyo-plus-aosp

* commit '738a0460c5c6b45506f5203b87d62f2ac99a8e7a':
  Don't inflate the zoom button controller until we


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