tree 7c50fcfea8df4abcf7d1e210ead8fb9db26c4e65
parent a3097ff9327ce7ac2cad3d5250d90170676c44b9
parent 32e07b318c6ae238ca8df1684d52dec45c65489d
author Chih-hung Hsieh <chh@google.com> 1496684361 +0000
committer android-build-merger <android-build-merger@google.com> 1496684361 +0000

Merge "Add OWNERS in system/security" am: aad9ba51cd
am: 32e07b318c

Change-Id: Id00b366aa4c19bb7a334c54cfc764a34e0508c3b