tree aa9615d976ec82ae66a1b75f49704396d9332f63
parent 78831d900d13174a8503009adb8e7cb09673c306
parent 969934f908ff2ddda77bddbb80f206daf6a24281
author Bill Yi <byi@google.com> 1503513769 +0000
committer android-build-merger <android-build-merger@google.com> 1503513769 +0000

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

Change-Id: I81db42f00242929b486585e4fe6d7baeed195fd2