tree be36cac171fe0ae3c34beaba77e6e47a99f73096
parent dd2f15a563f18c9534cfa85fe2b8bf2fe100ed83
parent e72fe16146dd33cb218bf8c16b069f68f331fdf8
author Victoria Lease <violets@google.com> 1349395821 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349395822 -0700

Merge "Prevent  overflow in LocationRequest.setExpireIn()" into jb-mr1-dev