am 85f7af7a: am 1af0187c: am 2e107841: am be3be424: Fix a bug that happens upon a race condition

* commit '85f7af7ac6d397416562502d140b193fdef7df79':
main
Jean Chalard 2013-10-03 12:16:07 -07:00 committed by Android Git Automerger
commit d2e9013003

Diff Content Not Available