tree 4d5807b107e3c7a99bb54fcdffc6023a7f73d4df
parent 95c2d02257246e0b87f38efc56fa325a94388c32
parent 9d31f82f583040fe04f04ae96c4d48da94d8dd19
author Sergii Boryshchenko <sergii.boryshchenko@globallogic.com> 1526084617 -0700
committer android-build-merger <android-build-merger@google.com> 1526084617 -0700

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

Change-Id: I9d7ce6d4118d74beb280b33e1e7b306ccaa00118