tree 85a35860152ce69c7dfd806740cb6d37df5322fb
parent 907da97059158a981de5eeda25dc8b7a876ad169
parent c42087e5c011dbf912c0f8b8d27d15ec5a97dca1
author Winson <winsonc@google.com> 1469771768 +0000
committer android-build-merger <android-build-merger@google.com> 1469771768 +0000

Merge changes I33da0d7f,I36c31609 into ub-launcher3-calgary
am: c42087e5c0

Change-Id: Ic169d18dab27357283b16dd1d705821052874b38