| commit | 65dd538630d0961b7d732a27da02817186eb7d26 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 14:51:00 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 14:51:00 2012 -0700 |
| tree | 436a25259862e4b3548bc4db9f7ce3bcb0d0c154 | |
| parent | d2e4cb09054364f1b09e453426f642961cfbf7cf [diff] | |
| parent | 1687164a25c537f456cb4d212d128c99870bdf07 [diff] |
am 1687164a: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '1687164a25c537f456cb4d212d128c99870bdf07': Fix event color query (which fixes the failing CTS test).