tree 8a2ff20efdf6b702c63d946a40a80ccbc7cae05b
parent 74e5ccb28bfc28b58a757740cd848b18e3ea04eb
parent 95a7d377a312ea7161eac6bc7f01851c3e51695c
author Yifan Hong <elsk@google.com> 1518045690 +0000
committer android-build-merger <android-build-merger@google.com> 1518045690 +0000

Merge changes from topic "vintf_matrix_sepolicy" am: 058d6c2d1e am: 832c80d05b
am: 95a7d377a3

Change-Id: Ib574e20fceed10feadc96e7768355b024bf8a368