OSDN Git Service

Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev
authorPaul Lawrence <paullawrence@google.com>
Thu, 31 May 2018 21:21:39 +0000 (14:21 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 May 2018 21:21:39 +0000 (14:21 -0700)
am: 89e1217c8f

Change-Id: I35b0b5f5b6b083df6be10e78b590341be64eb074


Trivial merge