am 7b306ae2: am 90cfe0f2: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1

* commit '7b306ae225b0a7337972f4d8bff51e8f79be3a03':
This commit is contained in:
Tsu Chiang Chuang 2012-02-23 08:34:56 -08:00 committed by Android Git Automerger
commit f6611b1e17

Diff Content Not Available