tree fc53aded30d9c8a14c59ed878b50934766d74207
parent 9db60f4e5b6a982f539a8f6e857ed1a929719f23
parent 54b4b8fdfc336b8a4902637e622c3ede879edcde
author Chad Brubaker <cbrubaker@google.com> 1446845131 +0000
committer android-build-merger <android-build-merger@google.com> 1446845131 +0000

Merge "Use a builder for NetworkSecurityConfig" am: 7e98f2e697 am: 478fad3cf5
am: 54b4b8fdfc

* commit '54b4b8fdfc336b8a4902637e622c3ede879edcde':
  Use a builder for NetworkSecurityConfig