tree 18cb223d20b4b138cda664121b2d12028b478186
parent efb8eda41a2dce03db0984c490c16f6a32867ded
parent 1b11b64bb66b624f1bcfef89c4b6f6af75a06ff1
author Glenn Kasten <gkasten@google.com> 1300925026 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1300925026 -0700

Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1