| commit | b57981c665cd5e369e880dc942d6adcbb746547c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:35:37 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 06 13:35:37 2012 -0700 |
| tree | a352c67d0eacc19da2c51d35a6882835de418507 | |
| parent | 7177a6aeac8eff88bf41824dd794c48c1522b716 [diff] | |
| parent | caa99d67db399278fceee1deee54a18fa7756989 [diff] |
am caa99d67: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'caa99d67db399278fceee1deee54a18fa7756989': Fix a deadlock in commandSetVideoBufferCountL()