tree 2ec4d9a70d7f7dfc087d581dd41c575367d2d587
parent 60dbafb19c604c7aab4a974d12284b4386e874a4
parent dc031941bf6b00bf6dd54712ccb92a5da144b8b8
author Android Build Merger (Role) <android-build-merger@google.com> 1481942421 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481942426 +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