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

* commit '96aa7f903774102a0ac635346b3c83aeef4410ef':
main
Jean Chalard 2013-09-26 07:40:52 -07:00 committed by Android Git Automerger
commit 327510b071

Diff Content Not Available