tree 301e5e298d49d23a8666e826665feba91633c557
parent bc52cce276b6238e8f30f71a0dcf24209481261e
parent 6ffa76077ddbecb0f432a805ed9999436ac308f1
author Guang Zhu <guangzhu@google.com> 1328672527 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1328672527 -0800

Merge "Revert "Make NDC not block forever and handle restart.""