tree d8711fe43d637cde27f6007209f78ab97403cd41
parent aac88d664d7260dcd40485d0f4aafe2f0275d123
parent 7f8ce7c946b28c2d4ef238fa43d0cf101b53cb21
author Alice Yang <alice@google.com> 1378279830 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378279830 -0700

am 7f8ce7c9: Merge "Revert "Revert "NPE in TwoPaneController""" into jb-ub-mail-ur10

* commit '7f8ce7c946b28c2d4ef238fa43d0cf101b53cb21':
  Revert "Revert "NPE in TwoPaneController""