tree 4284d9cbb6fdf0c4e21dde7a4b0cef172d5ae2ba
parent 9f68d4d0a8b6ac908e68415a8c6222db9261d684
parent 695b722928a61b5cc7c7426590821114bd50eed4
author Adam Cohen <adamcohen@google.com> 1381357572 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381357572 -0700

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

* commit '695b722928a61b5cc7c7426590821114bd50eed4':
  Fix NPE in CellLayout (issue 11113502)