tree 7c9e6fa46b46d4a31b4908b1662b3928da8415e6
parent 14814142b9c00c59da18817a36327a377cefb2e4
parent 4e7a014e0b4eca3860825adb657e5270c73c8da4
author Nick Kralevich <nnk@google.com> 1511832598 +0000
committer android-build-merger <android-build-merger@google.com> 1511832598 +0000

Merge "Standarize on VFS_CAP_REVISION_2" am: af03f483d7 am: cac2163a6b
am: 4e7a014e0b

Change-Id: Ibe7d0536ec061763f7b088917381a0da6e4c7453