tree 8075fe49bb6fb2471fe9c0fe3385cc17fc45655a
parent 8c17529454ab2abd920688a4f8f5d676de10fd47
parent 3d7ca9d2aefd20dc115f20532c1e19fdb60f7d68
author Vikram Aggarwal <viki@google.com> 1337301470 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337301470 -0700

Merge "Consolidate OnePane, TwoPane, and Conversation Destructive actions." into jb-ub-mail