Commits
The Android Open Source Project authored and Android Git Automerger committed bf4564f03daM
am 5adfe6c5: merge from open-source master Merge commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f' * commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f': Fix the problem that color drawable cache key conflicts another drawable one.
Showing diff toa5086683092