summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2011-03-09 10:53:44 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-09 10:53:44 -0800
commit2598bf600c3d5cedc8fd10acdeb97d5a414b256c (patch)
tree520c397427aa92e0a02d82e4b3433c57ef97753f /media/libmedia
parente18a4067e0af3a234095c54f83556c68484c6ab9 (diff)
parent246b2b313cb545da9d6f791b90d5a1cc4316114e (diff)
downloadframeworks_base-2598bf600c3d5cedc8fd10acdeb97d5a414b256c.zip
frameworks_base-2598bf600c3d5cedc8fd10acdeb97d5a414b256c.tar.gz
frameworks_base-2598bf600c3d5cedc8fd10acdeb97d5a414b256c.tar.bz2
am 246b2b31: am 12c37caf: Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
* commit '246b2b313cb545da9d6f791b90d5a1cc4316114e': Consider mInitialScale when setting min zoom scale.
Diffstat (limited to 'media/libmedia')
0 files changed, 0 insertions, 0 deletions