tree e6470414a08d65def70e8367f15b5fd012a15b83
parent ed783245b15a27723c99ed13ef05bbea4a4174e6
parent 555bd80caf9e3d5ff74b1f7b76cd7bc1e4fbd97b
author Paul Westbrook <pwestbro@google.com> 1371191516 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1371191517 +0000

Merge "Move support for settings menu to UnifiedEmail" into jb-ub-mail-ur10