tree aa9615d976ec82ae66a1b75f49704396d9332f63
parent 0283fe2aa4fa6319058bad3846ebdbdbd615e473
parent c61e5b02e0dba6d0f9d33449c3d085bd87b9bca1
author Bill Yi <byi@google.com> 1503514039 +0000
committer android-build-merger <android-build-merger@google.com> 1503514039 +0000

Merge remote-tracking branch 'goog/ub-launcher3-calgary' into HEAD am: 969934f908
am: c61e5b02e0

Change-Id: Ie06475440938e97772e78b6cfe4fb4bf497da1cf