summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2012-12-05 14:03:27 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-12-05 14:03:28 -0800
commit7b0855715bc6cb14e3ca67d815915d2172f0bc12 (patch)
tree0588e83ae4d2ce60b9c4ecc42310e9ea52d7cf3a /media
parentab3a5d944eb5b39ed00f3422cee691570e05a3ce (diff)
parent5959bf2d3c7fcfa4058cbcf81c3dc376c962d25e (diff)
downloadframeworks_base-7b0855715bc6cb14e3ca67d815915d2172f0bc12.zip
frameworks_base-7b0855715bc6cb14e3ca67d815915d2172f0bc12.tar.gz
frameworks_base-7b0855715bc6cb14e3ca67d815915d2172f0bc12.tar.bz2
Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions