| commit | 082baf61727b1ba72618ea58505b927aff0fc6ce | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Tue Aug 14 01:12:30 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 14 01:12:30 2012 -0700 |
| tree | f7e7c6ad6e119ad65fa68d4a01cfc30f995f7a04 | |
| parent | daf3759fb360c565d45d864832ae92da7daa7619 [diff] | |
| parent | 4de3bc305bd817aec0d9c413a3cf1f79bff3b160 [diff] |
am 4de3bc30: am a0cd0584: Merge "Preemptive anti-deadlock device" into jb-mr1-dev * commit '4de3bc305bd817aec0d9c413a3cf1f79bff3b160': Preemptive anti-deadlock device