commit | 443453aa516ba00020999464d06e16f7c0433100 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Thu Feb 02 13:21:24 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 02 13:21:24 2012 -0800 |
tree | d91e79150a4193cd4242f2490dec0917633c8351 | |
parent | 41e0afa6943de9d233e4710e9f51d9dec662bf14 [diff] | |
parent | 2c5674aa7ba006a712cf885be1657f754f2dee96 [diff] |
am 2c5674aa: Merge "Avoid NDC deadlock when re-arming network alert." * commit '2c5674aa7ba006a712cf885be1657f754f2dee96': Avoid NDC deadlock when re-arming network alert.