tree 7a19c73d4077aba2485e9a8b748b1de36965a113
parent 103eeee194d20e4743f5c390d3c4ec3e54e90cd6
parent 9ed777d03df6724035f1c4e0163ef3b4b9004d13
author Erik Kline <ek@google.com> 1474420954 +0000
committer android-build-merger <android-build-merger@google.com> 1474420954 +0000

Merge "Handle more commands in StoppingState" into nyc-mr1-dev
am: 9ed777d03d

Change-Id: I3a00c9b514620fd29fc30ab907406c2137347808