tree 45c1dd1e229326c294071ea1798dd69a6b75ec69
parent abb9bd35c7ce3c5e629bb5b676ecadf336be5d07
parent 95a633d653ab667a6450d72a060b22470a98dcf7
author Selim Cinek <cinek@google.com> 1560361089 -0700
committer android-build-merger <android-build-merger@google.com> 1560361089 -0700

[automerger skipped] Merge "Fixes an issue where the wrong icons where ambient" into qt-dev
am: 95a633d653 -s ours
am skip reason: change_id I2e571353735efb0d763ecc236f60aefe4c2b51d4 with SHA1 da330ff413 is in history

Change-Id: I2f5d9d65a73f5ee618a770ce5fe60631b3da621f