summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-09-06 11:51:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-06 11:51:53 -0700
commitfb3ec448f1208d75edebff0e93fa97a8913ff29e (patch)
treec93c0101d6c73c8cdb9e8bcf164a3182c092e4db /media
parent49a7387418c24f03d9248e0cbc12c59d8516ba83 (diff)
parentf66603e109d439e3a537cd3804706609ce86970e (diff)
downloadframeworks_base-fb3ec448f1208d75edebff0e93fa97a8913ff29e.zip
frameworks_base-fb3ec448f1208d75edebff0e93fa97a8913ff29e.tar.gz
frameworks_base-fb3ec448f1208d75edebff0e93fa97a8913ff29e.tar.bz2
am f66603e1: am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"
* commit 'f66603e109d439e3a537cd3804706609ce86970e': Make SimpleSessionDescription locale safe
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions