am b1cc90c5: am 2646b3a4: Merge "Prevent  overflow in LocationRequest.setExpireIn()" into jb-mr1-dev
am b1cc90c5: am 2646b3a4: Merge "Prevent  overflow in LocationRequest.setExpireIn()" into jb-mr1-dev

* commit 'b1cc90c553a7aaf029a84249bb9578c7d88fd53b':
  Prevent  overflow in LocationRequest.setExpireIn()

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base