| commit | 861be769a706659dd9b852717406b4f0a0810ea9 | [log] [tgz] |
|---|---|---|
| author | Yu Ping Hu <yph@google.com> | Mon Oct 21 16:05:16 2013 -0700 |
| committer | Yu Ping Hu <yph@google.com> | Mon Oct 21 16:05:16 2013 -0700 |
| tree | 0d0d860d82799be92f2fb71765ac0f850a2d0914 | |
| parent | 6c6c4fd048a9fd95048e92b116899d9573bad97d [diff] | |
| parent | a2210d035e51d0656f7e58c8c4c0a3b126de7d64 [diff] |
resolved conflicts for merge of a2210d03 to jb-ub-mail-ur11 Change-Id: I59debf71bdde2cf1b73c914ae611249924f22043