tree 585da62601ce7f0fd3048c167aedfe83a2ce4bdf
parent c590ba80552a893b848bd2b4675c2f4afd4dc26e
parent cd5de8b5aa8d812a5d12ab4e7d853fadd2df63b5
author Vikram Aggarwal <viki@google.com> 1367522787 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1367522787 +0000

Merge "Two options on narrow; Three on wide" into jb-ub-mail-ur9