| commit | cd5f159420b9f1121cf19fde1c295806d937ca82 | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@google.com> | Fri Dec 16 07:31:34 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 16 07:31:34 2011 -0800 |
| tree | 963cbfac63f262630fdf4d5a8db6322401df82dd | |
| parent | ada81693a11e0dcdf57b9ad726bf073e67170317 [diff] | |
| parent | 844756be54681dd96b822558b136367e459e5e6a [diff] |
am 844756be: Merge "Simplify enable/disable mixing" * commit '844756be54681dd96b822558b136367e459e5e6a': Simplify enable/disable mixing