tree ec11041d82c630aadadf8e0450b0bee1ea427e04
parent 595224063336dc3307def2743b84349e87117df9
parent f514f207c2f2e22c4df179ce0d8eb16966e6b5dc
author Tony <twickham@google.com> 1496458229 +0000
committer android-build-merger <android-build-merger@google.com> 1496458229 +0000

resolve merge conflicts of 629a67c5a to ub-launcher3-dorval-polish
am: f514f207c2

Change-Id: I97dfacf4710ce91783f35a07729047d9113129ba