tree e3ec2e16e969670170e68c438343fbceed182491
parent 1a2344b8b2c374cb32ff4af020666e6910ff2a8f
parent a15e4886de8f75f3cb137f51743d330414c910e8
author Jean-Baptiste Queru <jbq@google.com> 1290043788 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1290043788 -0800

am a15e4886: Merge "Framebuffer: Support variable number of framebuffers in the UI"

* commit 'a15e4886de8f75f3cb137f51743d330414c910e8':
  Framebuffer: Support variable number of framebuffers in the UI