tree ca17797bd8c524e25d791d46312fea7d2bb43b0c
parent 8ca8a69d5801ad4b809e7b9dbf53bd728820924b
parent 25ce9ed57f137dc0b21045ab90fe595640ebf926
author Jeff Sharkey <jsharkey@android.com> 1328217577 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1328217577 -0800

Merge "Avoid NDC deadlock when re-arming network alert."