| commit | 38a772a12d7b4f8ff5ed386a23e0a064c8b24065 | [log] [tgz] |
|---|---|---|
| author | Jin Cao <jinyan@google.com> | Fri Apr 25 15:42:38 2014 -0700 |
| committer | Jin Cao <jinyan@google.com> | Fri Apr 25 15:42:38 2014 -0700 |
| tree | 0f6239d1873bfd227c441675fd29b822dfea1e97 | |
| parent | 19c6369961fb228c29345446278bfa584a7c86ad [diff] | |
| parent | 8bf9c21a6e89e812621fe2d46c799651f9677784 [diff] |
resolved conflicts for merge of 8bf9c21a to ub-mail-master Change-Id: I2e653bf81290dc43bf3384c5a89f8c30b493777d