tree 68f4866bb7d72259b96f1d939f0834c2c5b3c905
parent eba86e51474e9d75fc21dc7e75d663a53dd5094c
parent 3ad62336852606f205bb345e3ef5e32e54a91e9d
author Jason Monk <jmonk@google.com> 1498673615 +0000
committer android-build-merger <android-build-merger@google.com> 1498673615 +0000

Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev
am: 3ad6233685

Change-Id: I3d90b93e7dd896157dc1f645f3d8327bb0afd59a