tree 2ec4d9a70d7f7dfc087d581dd41c575367d2d587
parent f34e9fc48daca51ace3e3c714d22a47a3a850b1e
parent 68b2be61054904831e1f665fc984a7f8b43d0603
author Mark Lu <marklu@google.com> 1481942347 +0000
committer android-build-merger <android-build-merger@google.com> 1481942347 +0000

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

Change-Id: I51f8ea1b15702094cfb9b3761bbeaf3f3ed4022b