summaryrefslogtreecommitdiff
path: root/libs/hwui/PathCache.cpp
diff options
context:
space:
mode:
author Mike LeBeau <mlebeau@android.com> 2010-09-08 17:49:34 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-08 17:49:34 -0700
commit13831586874fab1592a9d6f9134a693b0b27bae8 (patch)
tree466fb3dc1374f10da6d3be11659e299f260cb3f2 /libs/hwui/PathCache.cpp
parentb149f57d5ebe6afef819766962eee45c12bb5a5f (diff)
parent573c5d5edc1f51fd026e1d0e17ab883403eeddd9 (diff)
am 573c5d5e: am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread
Merge commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9' * commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9': Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
Diffstat (limited to 'libs/hwui/PathCache.cpp')
0 files changed, 0 insertions, 0 deletions