tree a2472f415d7544a7599905cfa0cdaba0fb77c918
parent c5cb691ca6a746a193bfbe3525aafa7cbb281d40
parent 4f7fdd297881ee7b794fd3dda11ab29d9ec2c2fe
author Nicolas Geoffray <ngeoffray@google.com> 1429879414 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1429879415 +0000

Merge "Make tests assume ANDROID_ROOT is not /system."