tree 826507b3c2796999492ca337cda5fc67ad1af8e7
parent dd3c1bde77e3dcd59ec97aeb48cc95d7c8095481
parent 64233b86f3a78d2c4a21092b242ad071a6b38bd5
author Glenn Kasten <gkasten@google.com> 1300925395 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300925395 -0700

am 64233b86: am 503f4daf: am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1

* commit '64233b86f3a78d2c4a21092b242ad071a6b38bd5':
  Bug 4159373 Use HDCP debug settings