tree c3b2a1c9b82324b49f222fa03720a23e5ceafc7d
parent fff892a525fc2d8071fb7df3ba1f5574f5709b35
parent ff9155674d423fcca84442c1f0817adc16f5544b
author Sunny Goyal <sunnygoyal@google.com> 1468535099 +0000
committer android-build-merger <android-build-merger@google.com> 1468535099 +0000

Merge \"Adding a view to indicate space blocked by QSB when QSB is hidden\" into ub-launcher3-calgary
am: ff9155674d

Change-Id: I765839c0b671d2866006d236299fe92215c86bbc