tree 0dea09ccdbdf495885d089edca935672ec7a995c
parent 2e3e8bad737d96d60aa1bb74a61fd1ddc96f76d3
parent 2aa31b8fcc109a63a573404e977ebf1c41633b43
author Tony Wickham <twickham@google.com> 1467330597 +0000
committer android-build-merger <android-build-merger@google.com> 1467330597 +0000

Merge \"Fix some issues with shortcut containers opened inside folders.\" into ub-launcher3-calgary
am: 2aa31b8fcc

Change-Id: I9659470321eca9bf9c61d74ca0873c2b66a437d3