tree c680851f5a5e6db0ab5ee7a3624d4af85fc1c11b
parent 5fab14313b55cd8c76080241c9f43851d27eb850
parent 822e8289716e5d28f15b2dd7eb8848760a280851
author Andreas Gampe <agampe@google.com> 1516848517 +0000
committer android-build-merger <android-build-merger@google.com> 1516848517 +0000

Merge "BitmapDrawable: Suppress errorprone warning" am: 25e50ccccb
am: 822e828971

Change-Id: I0481e40c91e5848fc7ab551a794269d9379cbcc9