tree 563b223beb8b28bad2d3ff7192ba5c82af45659c
parent 2b23702057fbb149a762c8c514309b0a3c5a3d36
parent 6e8dc3572fb424b488e09fcc2e695a2655cbb68d
author Michael Jurka <mikejurka@google.com> 1320099197 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320099197 +0000

am 6e8dc357: Merge "Fix NPE" into ics-mr1

* commit '6e8dc3572fb424b488e09fcc2e695a2655cbb68d':
  Fix NPE