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