am 7ed813af: am fa2f9d89: Merge "Merge commit \'177a5df9\' into manualmerge2" into klp-dev-plus-aosp
* commit '7ed813af226521b17c93e3341b6133d400ea0172': Fixed broken link in ActivityInstrumentation sample description.
This commit is contained in: