tree d374e53b4793faa101942f6afbc071fc60bd7144
parent a9a43ec683808f3432d9b8d41a1daee9c0f847bc
parent b01e3652c15c1291cd3c4acf21b71f450d17467c
author Daniel Xie <dxie@google.com> 1445298598 +0000
committer android-build-merger <android-build-merger@google.com> 1445298598 +0000

Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df am: 518668280d am: 7158f893b1 am: f7c3e996b3
am: b01e3652c1

* commit 'b01e3652c15c1291cd3c4acf21b71f450d17467c':
  Allow number of supported Bitmap to be greater than 4.