tree 4edb22fb6ae2ed864cfc345aac718657ba673656
parent ebc6729cb9daa08673a15f83d8a1be923cf3f4de
parent ce2d5723cbc76e35e09992deee245002eb0dfed5
author Mark Lu <marklu@google.com> 1482171444 +0000
committer android-build-merger <android-build-merger@google.com> 1482171444 +0000

Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 am: 68b2be6105
am: ce2d5723cb

Change-Id: I0ae10e6687075ccd62bd35eeb916f951cffc0d0f