tree 4284d9cbb6fdf0c4e21dde7a4b0cef172d5ae2ba
parent 3c729910f8883dbc3f38a729a4b4b2026462be61
parent 558f1c2ac73c3a0c3c0c316222b6b7f9c76e2501
author Adam Cohen <adamcohen@google.com> 1381357452 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381357452 -0700

am 558f1c2a: Fix NPE in CellLayout (issue 11113502)

* commit '558f1c2ac73c3a0c3c0c316222b6b7f9c76e2501':
  Fix NPE in CellLayout (issue 11113502)