tree 4e759aff2a72720a9890c4b6fd39efa6afcf503f
parent b9c332e69dc21c5cf2734a481000a82688c65981
parent 43a1cc1adc835f9a5df30ca2558a2aee35019706
author Andrew Sapperstein <asapperstein@google.com> 1367604367 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1367604367 +0000

Merge "Update settings per latest UX spec." into jb-ub-mail-ur9