tree 6a9ad52adc45d3a588bfd4422db37bdaa34b289c
parent 873f1e96814ec53436b6bd35a1e044a7c4bc54d5
parent b35baa53f70efa42b985f83a0cf0fb205de01900
author Jeff Sharkey <jsharkey@google.com> 1523302823 -0700
committer android-build-merger <android-build-merger@google.com> 1523302823 -0700

Merge "ContentResolver should handle dead system_server." into pi-dev
am: b35baa53f7

Change-Id: If031d0b3d41da26e9d167756668db098c7dca574