| commit | 6af70772b2037d3527337f220fc053af73d4c81d | [log] [tgz] |
|---|---|---|
| author | Scott Kennedy <skennedy@google.com> | Fri Sep 20 19:27:56 2013 -0400 |
| committer | Scott Kennedy <skennedy@google.com> | Fri Sep 20 19:27:56 2013 -0400 |
| tree | 34b1d8bce4a8a670565f41f8f9b13c2ae95f62ec | |
| parent | d1c7c36c79918dc58829a60c5b802aadf32833a4 [diff] | |
| parent | 4df54f8f10306cee92cb0d10d9dcacef3b63b41b [diff] |
resolved conflicts for merge of 4df54f8f to jb-ub-mail-ur11 Change-Id: I7d3e7edab211f7b713d75b2b020c746bcdf87d1a