OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4ef29f 906d4c5)
am eba12749: Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE...
authorWu-cheng Li <wuchengli@google.com>
Thu, 19 Aug 2010 18:10:44 +0000 (11:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Aug 2010 18:10:44 +0000 (11:10 -0700)
Merge commit 'eba1274978911ea188eead128645299669d02f60' into gingerbread-plus-aosp

* commit 'eba1274978911ea188eead128645299669d02f60':
  Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE


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