tree 055c6f4fefe473b4c041027d5ed71ebecc07977b
parent d28ed49ea7fa54a16512c11c83ca8fec942b27af
parent 323caa34b921782a5765b49b72a2483f76ee85de
author Jean-Baptiste Queru <jbq@google.com> 1290550724 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1290550724 -0800

am 323caa34: (-s ours) am 8c604349: Merge "Fix for a Launcher crash."

* commit '323caa34b921782a5765b49b72a2483f76ee85de':
  Fix for a Launcher crash.