OSDN Git Service

Merge "Add new Display API for secure video capabilities." into jb-mr1-dev
authorJeff Brown <jeffbrown@google.com>
Tue, 2 Oct 2012 23:39:07 +0000 (16:39 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 Oct 2012 23:39:08 +0000 (16:39 -0700)
commitbcbe9cf475835102ae2490dc9f067a3ac78a9551
treefd8e1b5efcce5a8a5b64edab5281690dd67e73a3
parent9c614bfe17e4e335d13ff5885a00fe8c3085fea1
parent77aebfdbae489c3712ae3f9bca29d01fb1f09dc2
Merge "Add new Display API for secure video capabilities." into jb-mr1-dev
core/res/res/values/symbols.xml
services/java/com/android/server/display/OverlayDisplayAdapter.java