| commit | 385bb2eb5184686c2d953fe4757522e61acb3392 | [log] [tgz] |
|---|---|---|
| author | Katie McCormick <kmccormick@google.com> | Fri Aug 09 17:55:05 2013 -0700 |
| committer | Katie McCormick <kmccormick@google.com> | Fri Aug 09 17:55:05 2013 -0700 |
| tree | 5b6d04e1eae33b7b6d265150c38ced1c83485f9f | |
| parent | 02eab434ad9faa25291e63023b7e66698ca457a8 [diff] | |
| parent | 45178b13407077c1993c0183f11cbf1b1f781e40 [diff] |
resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev Change-Id: I3f0f4d210dd48ddbed5795278c7e2b5f07da5978