tree 642b1c5c8a072a1f038935c26b447a9cfe67919b
parent b36a52eff88672d04e7fa5e516db1b6ac8136c69
parent 94c6b11bf68b2580e100e80cd0eb73bea6da4e52
author Hyunyoung Song <hyunyoungs@google.com> 1465339922 +0000
committer android-build-merger <android-build-merger@google.com> 1465339922 +0000

Merge \"Fix NexusLauncher NPE\" into ub-launcher3-calgary
am: 94c6b11bf6

Change-Id: I1e2c363964dbf66cd27e2145f6e116755da42e4d