[automerger skipped] Fix crash when starting daydream setting with wrong context am: d9c6692f25

am: 75fbb4511c  -s ours

Change-Id: I302bb9c60b9f0b0b32965f00db0222a68be17690
This commit is contained in:
Fan Zhang
2018-11-07 11:14:46 -08:00
committed by android-build-merger

Diff Content Not Available