tree 9540f6161c87135a58375ca8f74d528c333855da
parent d8b4f49d48e475ee940b9ed3f939d03f6e6c2b72
parent c760da5688be2dc0b5afe690685fc91d6d56ab0c
author Hyunyoung Song <hyunyoungs@google.com> 1472081772 +0000
committer android-build-merger <android-build-merger@google.com> 1472081772 +0000

Merge "Prevent against NPE inside ComponentKey" into ub-launcher3-calgary-polish
am: c760da5688

Change-Id: I0f05bb5ce62145f375d7927efe3d7341cc045ee6