tree d1838ab8efb6f2b3cc78a2b13734faab77f8a57d
parent 80c9f359cd4024e47888562f2de2138cac823f0b
parent 65dd538630d0961b7d732a27da02817186eb7d26
author The Android Open Source Project <initial-contribution@android.com> 1349215050 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349215050 -0700

am 65dd5386: (-s ours) am 1687164a: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '65dd538630d0961b7d732a27da02817186eb7d26':
  Fix event color query (which fixes the failing CTS test).