tree 900b94775a8bb5394b86d09f17da9357e29213fb
parent 07b3b2f11ff35002f7353551185d8f31df0ed3a4
parent ea45c2cb53b4d745f43850dcc4e794748425c5df
author Winson Chung <winsonc@google.com> 1318860420 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318860420 -0700

am ea45c2cb: Merge "Fix NPE" into ics-mr0

* commit 'ea45c2cb53b4d745f43850dcc4e794748425c5df':
  Fix NPE