tree 4edb22fb6ae2ed864cfc345aac718657ba673656
parent bebba0706055c490e7759df5db5588f7ec5a50a6
parent 60dbafb19c604c7aab4a974d12284b4386e874a4
author Mark Lu <marklu@google.com> 1482171450 +0000
committer android-build-merger <android-build-merger@google.com> 1482171450 +0000

Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 am: 68b2be6105" into nyc-mr2-dev-plus-aosp
am: 60dbafb19c

Change-Id: I9c4fe1812e91fbb37377472602a027a14de039e5