summaryrefslogtreecommitdiffstats
path: root/media/mediaserver
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-03-17 23:32:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-17 23:32:11 +0000
commit37e05edf1cfe297f9c7d382787ecab53d5a2b5c8 (patch)
tree91985c91ec47023bbfe1ed0b94a8ed9bcb5af1db /media/mediaserver
parent947237f67dd5335b26326a98fd7d3eae5fd7d702 (diff)
parent9a9481f89b26211b20d7f3fde3d54b455843bf70 (diff)
downloadframeworks_av-37e05edf1cfe297f9c7d382787ecab53d5a2b5c8.zip
frameworks_av-37e05edf1cfe297f9c7d382787ecab53d5a2b5c8.tar.gz
frameworks_av-37e05edf1cfe297f9c7d382787ecab53d5a2b5c8.tar.bz2
am 9a9481f8: am 0e7e5db7: Merge "More 32-bit only"
* commit '9a9481f89b26211b20d7f3fde3d54b455843bf70': More 32-bit only
Diffstat (limited to 'media/mediaserver')
0 files changed, 0 insertions, 0 deletions