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

Change-Id: I0bf163508c4e936b2876cfdab59b47e1b3740f09