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

* commit '9cd592c2102a2cf958b3c74b1a0a77866efb1401':
main
Jean Chalard 2013-09-26 05:55:54 -07:00 committed by Android Git Automerger
commit 96aa7f9037

Diff Content Not Available