tree 363fcafb043f13ab556f1f4d2334b3caa3ee6d51
parent 4a8938fd16740bf7833b446abe05d0d994f166e2
parent 452b4db5ce5206f050733a39fe95acad11617814
author Winson Chung <winsonc@google.com> 1336348927 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336348927 -0700

Merge "Fixing NPE in LauncherModel (Bug 6449627)" into jb-dev