| commit | 78bd04e183a9d8d8c031cc4d1c9b66f718da7bce | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 14:57:30 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 14:57:30 2012 -0700 |
| tree | d1838ab8efb6f2b3cc78a2b13734faab77f8a57d | |
| parent | 80c9f359cd4024e47888562f2de2138cac823f0b [diff] | |
| parent | 65dd538630d0961b7d732a27da02817186eb7d26 [diff] |
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).