tree 2c444789400a2330e7b7e461754e916a5f722b57
parent dd762ffb0b7efc7e8522343bd62553d7bd404751
parent 09273b676e9659890651459c11bda73d67e925c0
author Jon Miranda <jonmiranda@google.com> 1495490636 +0000
committer android-build-merger <android-build-merger@google.com> 1495490636 +0000

Merge "Allow user to place PendingAddShortcutInfo in opened Folder." into ub-launcher3-dorval-polish
am: 09273b676e

Change-Id: Ie8594f9be8f81018b3dfc3f8bb8af02fb15ddcff