tree 3fb2e73b0b2d4368b762c816a8ac15c0d04b427f
parent 482ae5f2388a07d60d7f3b54432120172af25eee
parent 4fe25f693ad311556fb232c352ed0b84d59343a5
author Tsu Chiang Chuang <tsu@google.com> 1329522830 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1329522830 -0800

Merge "fix NPE in race condition." into ics-mr1