tree 79f3929a7aa19eecdd1a7213579fd118777f7943
parent 48796d86e10aecd51b974899683f61965392e22e
parent 948908ff22db4dc7406fba1fd6a9429c5a42fc09
author Logan Chien <loganchien@google.com> 1511334713 +0000
committer android-build-merger <android-build-merger@google.com> 1511334713 +0000

Merge "vndk-def: Add VNDK comments to libselinux" am: 28c9c32cc1
am: 948908ff22

Change-Id: I006993d0971aaeecde59887e5474c51cf0416660