tree 1b7f06f3f96f36627470ae161d57e7bb305a1e07
parent 125139e8eb92aeca4a4403a5f388b8d6ffc22308
parent 0dc3de8f00eca862768f72eef99d9c63cf738f5d
author SzuWei Lin <szuweilin@google.com> 1519635561 +0000
committer android-build-merger <android-build-merger@google.com> 1519635561 +0000

Merge "Fix system-as-root detection on Pi" am: 60d31dd2f3
am: 0dc3de8f00

Change-Id: I470a121793410629b5328c3eee4d7d6f506ba66a