tree fd8e1b5efcce5a8a5b64edab5281690dd67e73a3
parent 9c614bfe17e4e335d13ff5885a00fe8c3085fea1
parent 77aebfdbae489c3712ae3f9bca29d01fb1f09dc2
author Jeff Brown <jeffbrown@google.com> 1349221147 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349221148 -0700

Merge "Add new Display API for secure video capabilities." into jb-mr1-dev