tree 3e4cc81f2b0eb599d3c5e3fece34e6609e071457
parent 3040be2b5d97fff15284815859083db3294b9aa8
parent 2307be9c4762131ccbfeda0ef81f4650909a782c
author Lifu Tang <lifu@google.com> 1493434812 +0000
committer android-build-merger <android-build-merger@google.com> 1493434812 +0000

Merge "Throttle location update rate in proximity alert" into oc-dev am: 23a66d44ea
am: 2307be9c47

Change-Id: If946fae16c1db2038f752a4837d5fb9ac0e14a2e