tree fc38678ab4ac738cd00cd6582fad864e7d3ae553
parent 566cb8a2894418368e9d45e796a3c2270a8e67a0
parent a0c2afbd6323b0f5164b6ddcf5f31aee81c6567c
author Dirk Dougherty <ddougherty@google.com> 1362517581 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517581 -0800

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

* commit 'a0c2afbd6323b0f5164b6ddcf5f31aee81c6567c':