am 64a86988: Modify test to avoid race condition. automerge: 3da136a

* commit '64a869880921b7e12d092b3fe7adc68fc74f98c6':
This commit is contained in:
Christopher Ferris 2015-05-04 17:08:06 +00:00 committed by Android Git Automerger
commit ede9292ca2

Diff Content Not Available