| commit | 7d257af54aba47ab662e34f0c9faf54d86ebd4a4 | [log] [tgz] |
|---|---|---|
| author | Andrew Sapperstein <asapperstein@google.com> | Tue Jun 11 11:22:07 2013 -0700 |
| committer | Andrew Sapperstein <asapperstein@google.com> | Tue Jun 11 11:22:07 2013 -0700 |
| tree | c8aac50005b85cf72fa0d70d25e500097c979450 | |
| parent | e84d4cb37b11460869e7d3003fc527fd53830dd9 [diff] | |
| parent | f950fd5df724a99e3584e231c321661bdfa6e9ea [diff] |
resolved conflicts for merge of f950fd5d to jb-ub-mail-ur10 Change-Id: I7ffb9ec33e74b118eb184b2794e08cec05650271