tree db896089a8940b137d966047722e4b313b99a407
parent b078b54e45b72e1c2874b4ea8a1055ded7d05b20
parent 7158f893b1c71386265248c981d723554724dab4
author Daniel Xie <dxie@google.com> 1445297315 +0000
committer android-build-merger <android-build-merger@google.com> 1445297315 +0000

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

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