tree b8a2484c4a5937b324fc108cf1831b51e9fcbc8a
parent a34c8b8a0c07de1d522bde8cef36fc3f6051e06d
parent 393d29f9d4056e8ddf9712f7744f517d47ee8fe4
author Hai Zhang <zhanghai@google.com> 1558445744 -0700
committer android-build-merger <android-build-merger@google.com> 1558445744 -0700

Merge "Align badging logic with platform IconDrawableFactory. am: b0be237b3f am: cb07a1c026" into qt-r1-dev-plus-aosp
am: 393d29f9d4

Change-Id: I7ec0904389746e1a7708076e464c25938ce8dede