tree 295fb1f4523c4888bc2411d57abbd19e11e67397
parent c66f1e27c0092afb0b3fdf26fe426b31ba02e414
parent 517303e05b9a9246c8aab53574d768eb52c88e7e
author Victoria Lease <violets@google.com> 1351629254 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351629254 -0700

am 517303e0: am ac14efce: Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev

* commit '517303e05b9a9246c8aab53574d768eb52c88e7e':
  DO NOT MERGE suggest LocationRequest rather than Criteria