OSDN Git Service

am ce0976cc: am 2ba97451: am f3b325f5: Debug feature for HDCP compliance testing.
authorAmith Yamasani <yamasani@google.com>
Wed, 23 Mar 2011 23:03:34 +0000 (16:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Mar 2011 23:03:34 +0000 (16:03 -0700)
* commit 'ce0976cccd8a283689b15e33ce2cfaf819620bf6':
  Debug feature for HDCP compliance testing.

1  2 
res/values/arrays.xml
res/values/strings.xml

Simple merge
Simple merge