tree f18ad50abc952c579027ae963b8ccd13dce338b4
parent 1bf1af60a3ec3da69aafbe1fe93c17312cb3e00e
parent 0db6a9e9a67e7e370cb55d3b4a1d855be9b80f98
author Dirk Dougherty <ddougherty@google.com> 1361904621 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1361904621 +0000

am 0db6a9e9: am a18ff6f1: am f809e96f: am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev

* commit '0db6a9e9a67e7e370cb55d3b4a1d855be9b80f98':
  Doc change: Remove refs to Copy Protection and note EOL in GP.