tree c0108158b1decba07c34c07659d121e558addfa8
parent 2b63a6210bb2a827e58d554535abd132341a9343
parent 52c656d77ce4e3ca95314aad3eaa7887c6c8796f
author Tony <twickham@google.com> 1497037807 +0000
committer android-build-merger <android-build-merger@google.com> 1497037807 +0000

Merge branch 'ub-launcher3-dorval' into launcher3merge am: 7e0801eafb
am: 52c656d77c

Change-Id: I08f7db7d282da0ad3cd39e7501a57f045b0c1290