tree c0108158b1decba07c34c07659d121e558addfa8
parent 5a78ad8ce88a12f67de288139a18eff7d311b437
parent 7e0801eafb1163f1f3b8416739a36dcf26610215
author Tony <twickham@google.com> 1497037069 +0000
committer android-build-merger <android-build-merger@google.com> 1497037069 +0000

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

Change-Id: Idea7a9c3217661f1b570dbd835dfe85ea2f00cb0