tree 840be0b83bfab2efa007d078b45846623a3842e1
parent 6ade9a9428958d052cb97a38293a50b421f837df
parent 3ed802de77e9847b45074f206a4ac310257f894e
author Winson Chung <winsonc@google.com> 1336349163 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336349163 -0700

am 3ed802de: Merge "Fixing NPE in LauncherModel (Bug 6449627)" into jb-dev

* commit '3ed802de77e9847b45074f206a4ac310257f894e':
  Fixing NPE in LauncherModel (Bug 6449627)