am 6f441d38: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6f441d38d863a64a463ae3c5ec188e7e2962b9e2':
  disabled agps state machine delete in cleanup
  gps: report session begin/end on gps start/stop
This commit is contained in:
The Android Open Source Project 2012-10-02 09:24:27 -07:00 committed by Android Git Automerger
commit d2d637cd6d

Diff content is not available