tree 2ec4d9a70d7f7dfc087d581dd41c575367d2d587
parent f34e9fc48daca51ace3e3c714d22a47a3a850b1e
parent 1c64c32051b2fcb71d139ccd9b6daf9a83e79015
author Android Build Merger (Role) <android-build-merger@google.com> 1481942353 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481942357 +0000

Merge "docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed am: c9328c18a4" into nyc-mr2-dev-plus-aosp