tree d61e86f4d00aaef11a3223371a5794c68daf3fc7
parent 3086d8f2e51ebc5795e6b1f945bd399cbde24356
parent eb95dde9d6b5f81832225dd0d2f78adfb378815b
author Winson Chung <winsonc@google.com> 1318860787 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318860787 -0700

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

* commit 'eb95dde9d6b5f81832225dd0d2f78adfb378815b':
  Fix NPE