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)
* commit 'd0cb3ab7560a3871fb132ba359dcb4613a9c2455':


Trivial merge