tree 4edb22fb6ae2ed864cfc345aac718657ba673656
parent 25fb40811027dd23ac5b51e43a5cef63a21676be
parent 178484897622bc2e60ec2c6ba43edcfd5205a819
author Mark Lu <marklu@google.com> 1482171567 +0000
committer android-build-merger <android-build-merger@google.com> 1482171567 +0000

Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 am: 760d127583" into nyc-mr2-dev-plus-aosp
am: 1784848976

Change-Id: I417c5d5f34d9b36cc649679d388e84819d8abbd9