tree d1838ab8efb6f2b3cc78a2b13734faab77f8a57d
parent 864156f921fc1d49517cfc3e04a6a7b7a7c4eab2
parent d2e4cb09054364f1b09e453426f642961cfbf7cf
author Sara Ting <sarating@google.com> 1349211937 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349211937 -0700

am d2e4cb09: am f4b1756f: Fix event color query (which fixes the failing CTS test).

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