| commit | 965537e0a4ffce356bdb74c63e0b975e648e8824 | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@google.com> | Tue Nov 27 18:43:32 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 27 18:43:32 2012 -0800 |
| tree | 924c52ec646264915c5944c4b07675cc5c5c1de1 | |
| parent | 6e406b10353af2c8ae9f7cd38f9053d4e017b4b1 [diff] | |
| parent | 5d7b2778d0e9849fa601d722ec2efcee7d032d4f [diff] |
am 5d7b2778: resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp * commit '5d7b2778d0e9849fa601d722ec2efcee7d032d4f': New VHQ resampler