tree 3654a3d68f96b4de6654daaeab28f9f5b7cb497d
parent c77916eef7fadeca762e2c95752d61faea7d66b9
parent 1a7884b6e516220ace1ab74196df445fee10592b
author Alice Yang <alice@google.com> 1378279643 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1378279643 +0000

Merge "Revert "Revert "NPE in TwoPaneController""" into jb-ub-mail-ur10