| commit | 8020c49368c2a9950e9f66092c6b07e46c5dac11 | [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 | c0de117fb5aeaee6dc8de71f251a90e98c0a8d65 | |
| parent | a10f9b0470f598c8edf0b11a7b4c78cdf7dd1f86 [diff] | |
| parent | 5dd0a57f26c6c8dadc35454e69813145141386c4 [diff] |
am 5d7b2778: resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp * commit '5d7b2778d0e9849fa601d722ec2efcee7d032d4f': New VHQ resampler