summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/StagefrightPlayer.cpp
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-07-01 08:04:11 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-01 08:04:11 -0700
commitcebcdaef5b559f4db2a9d8b305d9d7da03525b62 (patch)
tree8b512ebf1f8497121366a743aec16bf6ac176efa /media/libmediaplayerservice/StagefrightPlayer.cpp
parent0f30bd90272c818aa37c0bb22d22eaa7d3689879 (diff)
parent63d794763a680c29edccce3a6fac3d6d9c13c8e3 (diff)
downloadframeworks_av-cebcdaef5b559f4db2a9d8b305d9d7da03525b62.zip
frameworks_av-cebcdaef5b559f4db2a9d8b305d9d7da03525b62.tar.gz
frameworks_av-cebcdaef5b559f4db2a9d8b305d9d7da03525b62.tar.bz2
Merge changes I7e8401a4,I412ddf36
* changes: Merge Chromium at r11.0.696.0: New autofill strings Merge Chromium at r11.0.696.0: Using setter instead of direct variable access
Diffstat (limited to 'media/libmediaplayerservice/StagefrightPlayer.cpp')
0 files changed, 0 insertions, 0 deletions