tree 5bf5b2e3d168fa9a8e490edc1c64f667920b3b30
parent 774ed9d9537c15482e8baca2f2890c5d2f4ffe75
parent 55cc25c12c45e8ffb65d2275cc0b6941b68db9df
author Jeff Brown <jeffbrown@android.com> 1307494342 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307494342 -0700

am 55cc25c1: am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2

* commit '55cc25c12c45e8ffb65d2275cc0b6941b68db9df':
  Simplify spot tracking logic. Bug: 4124987