am d0cb3ab7: am 0c218aca: am d03ee772: Merge "Restore overlay support for RGB565...
authorJesse Hall <jessehall@google.com>
Fri, 6 Dec 2013 22:19:14 +0000 (22:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 22:19:14 +0000 (22:19 +0000)
commit74bb759d3459c67abe4762f086c089b2b0484365
treeeaff7d37ba3032d6462fa461c4a03f7828481db1
parent6d924b95fd34649548b4b89d9f5b5775570e42dc
parentd0cb3ab7560a3871fb132ba359dcb4613a9c2455
am d0cb3ab7: am 0c218aca: am d03ee772: Merge "Restore overlay support for RGB565 layers" into klp-dev

* commit 'd0cb3ab7560a3871fb132ba359dcb4613a9c2455':