OSDN Git Service

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

* commit 'ccb915963e70c9b4e8fc47b5af97ab37b979195a':
  Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE


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