tree cb4c2935315b9f4af42fc2aaa1a4b718467535ab
parent 2e0aadf2560c17a573c5622af65cbd426c366ae4
parent 87613775159568cbe872770c3bbe78e496e101db
author Joe Fernandez <joefernandez@google.com> 1466013770 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1466013771 +0000

Merge "docs: removing duplicate security config doc" into nyc-dev