tree 2ec4d9a70d7f7dfc087d581dd41c575367d2d587
parent 38dbcd1997c078d1cb87c667dcfcf60deb01b40f
parent ce2d5723cbc76e35e09992deee245002eb0dfed5
author Android Build Merger (Role) <android-build-merger@google.com> 1481942387 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481942389 +0000

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