| commit | 3eaffd241986d243a472cf7ad2fe116b74ceec1c | [log] [tgz] |
|---|---|---|
| author | Tony Mantler <nicoya@google.com> | Thu Oct 10 14:22:30 2013 -0700 |
| committer | Tony Mantler <nicoya@google.com> | Thu Oct 10 14:22:30 2013 -0700 |
| tree | 74738c6b135605d5d03a159d519f613e324f5fe9 | |
| parent | 6293ef09d934e191148279a72036f927366f82f0 [diff] | |
| parent | 0183066312b9468da81b0fe01357f56c0325fdc3 [diff] |
resolved conflicts for merge of 01830663 to jb-ub-mail-ur11 Change-Id: Ic0533ad2617c60e62ad97692a364cc8eb7bb0420