tree a8fa887198dc205670f958171521090ee84d2237
parent 75f4042a6ec24c386281330f1ce1633127077081
parent 1a6e6097d5148bda58001d6326d76b7aa1c21026
author Andrew Sapperstein <asapperstein@google.com> 1340043906 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1340043906 -0700

Merge "Fixing bugs 6673815 and 6673190." into jb-ub-mail