tree 6e96bbb982209f0e71386d422917e8b07f9b1e65
parent dd0f9af1161e491cb16d9705a3983650d3dc087b
parent 055066e1e77d944383360d50057f5b8187f23c0b
author Glenn Kasten <gkasten@google.com> 1299862000 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299862000 -0800

am 055066e1: am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1

* commit '055066e1e77d944383360d50057f5b8187f23c0b':
  Bug 3012968 DRM output control