tree 6ee18f7f5df495899b41475526cdbb507d4801ce
parent 1887af43a5dd5181f4582a6090ae25c7aa17fa4a
parent dbaaa38882b8f13c1ff3a0ea352584cdbbbcba72
author Andreas Huber <andih@google.com> 1348158581 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348158582 -0700

Merge "frameworks/native: Amend HDCP API" into jb-mr1-dev