Merge "docs: Updated wording of callout describing device opt-out options. am: b48909ed52 am: bdbe6fd94f am: 6c955db797 am: 82c686b714" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-08-04 02:01:02 +00:00
committed by Android (Google) Code Review

Diff Content Not Available