tree 0588e83ae4d2ce60b9c4ecc42310e9ea52d7cf3a
parent ab3a5d944eb5b39ed00f3422cee691570e05a3ce
parent 5959bf2d3c7fcfa4058cbcf81c3dc376c962d25e
author Victoria Lease <violets@google.com> 1354745007 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1354745008 -0800

Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev