tree fa347e80cb3bdc1676484edda410f6d02e188c69
parent 462f7e170a9f46287149ca8f059d683476d938b7
parent 06580312edc1fd1a94746de0626022e60d8e614e
author Winson <winsonc@google.com> 1469121152 +0000
committer android-build-merger <android-build-merger@google.com> 1469121152 +0000

Merge changes I09bce218,Id5716a34 into ub-launcher3-calgary
am: 06580312ed

Change-Id: I1ed3a1a937bf4d9667e4b154d060819169ffd931