tree 9a0ffa7c296422460a54bf85d41355da7e4d6f67
parent 507a5c03da5dd807f85902e6610c9b13ad75ab90
parent b38bfa1679eb613078cde16d99afa190c2b99ef2
author Kevin Hufnagle <khufnagle@google.com> 1474931521 +0000
committer android-build-merger <android-build-merger@google.com> 1474931521 +0000

Merge "docs: Fixed broken link to Android KeyStore facility" into nyc-dev
am: b38bfa1679

Change-Id: I304332f8a9bfa3a11f0bfbd84dfefc36f98b5886