tree dc6a04f8d6d89368414a5ca4163d2410dc5c8e12
parent aad8175ca8579aafafc2c3e6fed81ce9dd1d5265
parent 55076ea2b4b22067f3b1433336a8e66956b06862
author Kevin DuBois <kevindubois@google.com> 1564599193 -0700
committer android-build-merger <android-build-merger@google.com> 1564599193 -0700

Merge "composer: return pending config changes" into qt-r1-dev am: 27b5ed1da4
am: 55076ea2b4

Change-Id: I3534ff5233545aba8dfccaef650bae35863fa50e