tree 45ec13699f9d42199d2afacbe3da634acf9cf149
parent a73c1fac3d2608b61c0d9d4ea4aeb5236bbe6a6a
parent 17e1aeac4bcc15a53eb0e2139d8690aa788a4320
author Adam Cohen <adamcohen@google.com> 1384534212 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384534212 -0800

am 17e1aeac: Merge "Fix CellLayout UNSPECIFIED exception (issue 11627191)" into jb-ub-now-jolly-elf

* commit '17e1aeac4bcc15a53eb0e2139d8690aa788a4320':
  Fix CellLayout UNSPECIFIED exception (issue 11627191)