tree c96d9d9d67b3980c6e016cc556449bf30de40498
parent 598679cbad4fa92767b266342b7ee5f54780f6d0
parent 8a3d58655cdef731548e7aabae04f33ba30379dc
author Dmitri Plotnikov <dplotnikov@google.com> 1493334815 +0000
committer android-build-merger <android-build-merger@google.com> 1493334815 +0000

Merge "Adding support for quiescent reboot to recovery" am: 0481faef77 am: 5b27cd1093 am: 533ad31cc1
am: 8a3d58655c

Change-Id: Ida6d4e2bf06a902fc85e693e61b2e87f1afd736c