tree cd38be331a2a17f934a9dee4c19b43a0dfd3d9b1
parent ba4ac09d23d27f4d27d0c03a605ebfa1ed4b1858
parent 0a65737c55c5b1af5cedf086020558a8cc13763a
author Winson Chung <winsonc@google.com> 1494876666 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494876673 +0000

Merge "Ensure that we check against the pending state while suspended." into oc-dev