tree 1bdd7b10a8e081ec11ee67fb7104eaf5869e73d8
parent 8d326003c79958331e6636282ad0429a1d456edb
parent b1e9e8d662d3e6c945c817d09270c799b62b4af3
author Hyunyoung Song <hyunyoungs@google.com> 1467333590 +0000
committer android-build-merger <android-build-merger@google.com> 1467333590 +0000

Merge \"Fix hotseat flicker b/29648104\" into ub-launcher3-calgary
am: b1e9e8d662

Change-Id: Id1b6df9958afe496f8dd224de61332df03466d9f