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)
commitb3ea4778dfb02a92f96e3d191b8d08a3c88ffae6
treec0e8a76c0f9c65c670d10b722ccd7baea0347ddd
parentfd1276b259b81ba698ae7ae9f641e80dc099ecdb
parent46a07295367fbfcaa485e71125d41f947c9be39b
Merge changes I456d9ef6,I593c0231

* changes:
  hwc: do not require hdmi
  hwc: do not require manta to build