tree e0d2eb03980fd389c15f6c4c1fa40184587818b2
parent a2de7fc9fc0b96ba4db65ccf6c9684c8c27c2993
parent cc040d583b121e6a028e2dc47691d3f4f98c6e70
author Dirk Dougherty <ddougherty@google.com> 1436356141 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436356141 +0000

am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs

* commit 'cc040d583b121e6a028e2dc47691d3f4f98c6e70':
  Doc change -- update trade practices link.