tree 9a86ca440f50dd9661dc6c338385c22e196a1a80
parent c8d45456bddec043a1b3db6f047e59f0fee8d562
parent fa51f738b32683d2f2ebbc9dcb24ef75093e192d
author Kevin Hufnagle <khufnagle@google.com> 1474942030 +0000
committer android-build-merger <android-build-merger@google.com> 1474942030 +0000

Merge "docs: Fixed broken link to Android KeyStore facility am: c0c4ac5e35" into nyc-dev-plus-aosp am: eb510ea7c6
am: fa51f738b3

Change-Id: I7ca7153a902ca0cc2ee83e1f967ffdc392a0658e