tree ae93f42d3abdb01c426bef59adfafae068a57e2d
parent 784f9e928f0b1e38f6cc94d7f201258ef573f40b
parent 4f6e5f4e1e842f3f0552b673626c6d4bceaf1641
author Alice Yang <alice@google.com> 1378245440 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1378245440 +0000

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