tree 89612043131270a38947e2350c3afebef43b60c5
parent a419076eab4ebf54186c5801216f611e080edf5f
parent edcdaf64637163dd2a96fe4ad274f9a16d2f9e90
author Jeff Sharkey <jsharkey@android.com> 1436461154 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436461156 +0000

Merge "Timeout when partitioning takes too long." into mnc-dev