| commit | 19c6369961fb228c29345446278bfa584a7c86ad | [log] [tgz] |
|---|---|---|
| author | Jin Cao <jinyan@google.com> | Fri Apr 25 14:26:10 2014 -0700 |
| committer | Jin Cao <jinyan@google.com> | Fri Apr 25 14:26:10 2014 -0700 |
| tree | 9990cdd26aa6748a36811772268d927b74e9ba4c | |
| parent | 5a4a3d9f13e472b6b96352f68c1adcdaf6e373e5 [diff] | |
| parent | 779dd6012a6c5b4d71255085059e57d94eab1a3f [diff] |
resolved conflicts for merge of 779dd601 to ub-mail-master Change-Id: I538a22a6e934abaef8e7b3aced6fe8dbbffe7a97