tree 036f5dc3278f0bdda01204fde7e7addb7f86235d
parent b3a6b5c257509d9db84af6404281a765cb96f348
parent 804e2edc32fcc2239fd5ec2bd5bfea22f86d0646
author SzuWei Lin <szuweilin@google.com> 1519635990 +0000
committer android-build-merger <android-build-merger@google.com> 1519635990 +0000

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

Change-Id: I93de9ffe3bb427533865e0d1733068661a0d209f