commit | 7c49c030ebdadaad297dc6c81ee60d470c0a14af | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 09 07:31:52 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 09 07:31:52 2012 -0700 |
tree | a38b3c4b36acf6db065a96d5ada782691aaa6c61 | |
parent | 60a3a751d7369137a6167ec834edf9558bf84dec [diff] | |
parent | 7776457df5639aef8e836cded2de28118e2841da [diff] |
am 7776457d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '7776457df5639aef8e836cded2de28118e2841da': ugly, temporary, workaroung for a problem where a binder thread spins forever