tree e0a9cd6e42c958cdc15b37127ec30000492e2d41
parent 512b4d00441eb6672990f9af2135944d1f92323d
parent 9407db1e11f2f465c46590dd12926669eac1ca0c
author Hyunyoung Song <hyunyoungs@google.com> 1470246546 +0000
committer android-build-merger <android-build-merger@google.com> 1470246546 +0000

Merge "Fix disco bounce crash b/30413641" into ub-launcher3-calgary
am: 9407db1e11

Change-Id: I1f786330fd6635dc6a73e7503a4d38adfb108d03