tree 330f932d6d0b628cf96f57d71d37bfef52f0aae4
parent 791e51a5059826e3fb81dfa5b575bcae00a3d29c
parent f7c3e996b32a45e5a5264d634254b00f76ac9e0a
author Daniel Xie <dxie@google.com> 1445298193 +0000
committer android-build-merger <android-build-merger@google.com> 1445298193 +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

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