Merge changes I456d9ef6,I593c0231
authorDima Zavin <dima@android.com>
Thu, 6 Dec 2012 23:03:40 +0000 (15:03 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Dec 2012 23:03:40 +0000 (15:03 -0800)
* changes:
  hwc: do not require hdmi
  hwc: do not require manta to build


Trivial merge