tree c5bdb4ca65e238605254f8c72afe2aab3874b903
parent 3361d7a328393f8fa2a74d26bbbfa1cdc07338cd
parent 8d14e4970931d6d9bb5648bdaf608b58044b51ae
author Tony <twickham@google.com> 1496434292 +0000
committer android-build-merger <android-build-merger@google.com> 1496434292 +0000

Merge "Promise icons don't support popup" into ub-launcher3-dorval-polish
am: 8d14e49709

Change-Id: Id072635529ed39232f515220a9c82276a14bc814