tree e279b45fdf9491e69a73e53c1fa79fd34c45169b
parent f8d8c22e4d1254776f447a52ade03f05e57b0ec8
parent 9d170dbb65924d60f5a32a37496ec9142a186005
author Adam Cohen <adamcohen@google.com> 1392411224 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411224 +0000

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

* commit '9d170dbb65924d60f5a32a37496ec9142a186005':
  Fix CellLayout UNSPECIFIED exception (issue 11627191)