tree f346e3eaed6be79e6cb2468c4f2a28b77870e8b4
parent 48320925036a3bbbcd7449ea50b63453bb9eff2e
parent 340105677e597e4f009a05bb5d45d46bcba97431
author Fyodor Kupolov <fkupolov@google.com> 1466801589 +0000
committer android-build-merger <android-build-merger@google.com> 1466801589 +0000

Merge \"Prevent NPE in dispatchUserSwitch\" into nyc-mr1-dev
am: 340105677e

Change-Id: I73dc2ce8949b27bfc77634dc6be4dfbffc9ffa56