tree 2c0927046f8ee5dea7b4fe0a9e6e238f19a3bef3
parent c7410924a3ff7a4c7506bd854c8cc79a103f825f
parent 5b27cd109341b2da9ce0ef6e698a5f986d99b31f
author Dmitri Plotnikov <dplotnikov@google.com> 1493333223 +0000
committer android-build-merger <android-build-merger@google.com> 1493333223 +0000

Merge "Adding support for quiescent reboot to recovery" am: 0481faef77
am: 5b27cd1093

Change-Id: I5d7730fedba7a9b5e39bd4ee3d093036406a7bd4