tree 35b120d44aa5f91834cd0c668c18f7955a6f74ec
parent 0c8eb287ca60e03b805e02bad035d1f072d99446
parent d9877d97c07e5c33132f6227044f795bd5f9df05
author Kenny Root <kroot@google.com> 1452652032 +0000
committer android-build-merger <android-build-merger@google.com> 1452652032 +0000

Merge changes I4edd999d,I6dab5be8
am: d9877d97c0

* commit 'd9877d97c07e5c33132f6227044f795bd5f9df05':
  Fix several tests that were worded incorrectly
  Allow separation of path and certs