am cb1cb4a0: am 327510b0: am 96aa7f90: am 9cd592c2: am ba2f4f84: Merge "Fix a concurrency bug."

* commit 'cb1cb4a07905439b0ee528240e48669d65b5d8ee':
main
Jean Chalard 2013-10-03 15:16:00 -07:00 committed by Android Git Automerger
commit 39b04c1d26

Diff Content Not Available