tree 700cd8b3a358a00476643e57f7e3442c820db226
parent 12274923e4df118cfd05e50179d5f940221d6b46
parent f4cd2edfda31f3cd5f5ae75581001c700bab6a95
author Gustav Sennton <gsennton@google.com> 1568932305 -0700
committer android-build-merger <android-build-merger@google.com> 1568932305 -0700

Merge "SSIN: Use the application's context to load icon resources." into qt-qpr1-dev am: 0df74f4d32
am: f4cd2edfda

Change-Id: I65eb909f0e3cb755a88c874bc74facc4cc013fee