tree c0108158b1decba07c34c07659d121e558addfa8
parent 6958fda4ad3a9b573a563bb908def3114424421e
parent 7e0801eafb1163f1f3b8416739a36dcf26610215
author Tony <twickham@google.com> 1497037302 +0000
committer android-build-merger <android-build-merger@google.com> 1497037302 +0000

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

Change-Id: I3c5bf0a79aca97e7385ec6d066d1f93069ccfea5