tree 1e16fcbb56da6cf69c3d44738cfcc0c949312bc6
parent c679313559e90f0c35f15e1b5070c277ada981d3
parent f809e96fef4df25899c267e1cac648e08ba31a72
author Dirk Dougherty <ddougherty@google.com> 1361904296 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361904296 -0800

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

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