tree 5a442df9219374c384a931f0c481f15f8b0dc354
parent bd18140128ac5e0771cce66ed99ae242aa050581
parent bde267772d42cddf091ebcc2f18d95977ec6f9a5
author Dirk Dougherty <ddougherty@google.com> 1362517390 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517390 -0800

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

* commit 'bde267772d42cddf091ebcc2f18d95977ec6f9a5':