tree 1ee6698e87ccea55e87d7249491035c7cd43d0b1
parent eb510ea7c60730e4487836ce621976591a0f1bb2
parent d256aefc3fdfb1dca64e373935c400faf4cca81d
author Android Build Merger (Role) <android-build-merger@google.com> 1474931588 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1474931590 +0000

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