tree 5a21823c0312082613eee65a92cf99b2e7e8da30
parent 110738f94b8ffed733ac6fa130dbdfbd07a8393f
parent 27ae21a3d4c22ef5992dfabb0c29ce7299c1331a
author Dirk Dougherty <ddougherty@google.com> 1362517770 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517770 -0800

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

* commit '27ae21a3d4c22ef5992dfabb0c29ce7299c1331a':