tree 8e56ebca5ca3c759fd0c55147fe4517cbf385f16
parent 3c565d4d69142cacd44640f9b7c91647901dfa7f
parent f291ea0f83f4e055502151c3188ea5596389fac4
author Sergii Boryshchenko <sergii.boryshchenko@globallogic.com> 1526084858 -0700
committer android-build-merger <android-build-merger@google.com> 1526084858 -0700

[automerger skipped] Merge "DO NOT MERGE: Fix OsTest#test_xattr_Errno test on CTS" into oreo-mr1-cts-dev am: 9d31f82f58  -s ours
am: f291ea0f83  -s ours

Change-Id: I8a1aa5d4e9af698735bf6ab9b4b6cd1bd1920f7f