| commit | 2b7f8554645121c0d0cd8066f17f831e12e58963 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 10 11:11:53 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 10 11:11:53 2013 -0700 |
| tree | ccce143fcb19a5856c60cb67a35f604945e7cc4f | |
| parent | ca414a0b591abf4178033481098233f2210cb4cb [diff] | |
| parent | 5b5e0affac0abf011bbd0b4ea5bd5e6cebb5bc00 [diff] |
am 5b5e0aff: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '5b5e0affac0abf011bbd0b4ea5bd5e6cebb5bc00': hal: Fix Hangout and Voice call concurrency issue