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

* commit '39b04c1d26c713468ba0489d84b5b080349ac631':
main
Jean Chalard 2013-10-03 16:22:06 -07:00 committed by Android Git Automerger
commit de0373431b

Diff Content Not Available