tree bf5158c45d848cb1429afe0936122d5ced9bcee4
parent 4c2a16c2dd1cc86d4ac77bad180d16b5e961a940
parent 2580bd67833a94f71d603631af288da681f71671
author Jon Miranda <jonmiranda@google.com> 1507767692 +0000
committer android-build-merger <android-build-merger@google.com> 1507767692 +0000

Merge branch 'ub-launcher3-dorval-polish2' am: ea6d0e631e
am: 2580bd6783

Change-Id: If8816b1381769b9a8e8690647548ceb7a301ccce