| commit | 6dd38cc5343106251c8d66ab11bb93550082e594 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Mon Aug 12 17:38:03 2013 +0000 |
| committer | Scott Main <smain@google.com> | Mon Aug 12 17:40:37 2013 +0000 |
| tree | 5b6d04e1eae33b7b6d265150c38ced1c83485f9f | |
| parent | ebcee19783c4fe5ba776353e95974383850a4685 [diff] |
Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later." Submitted the original revert too soon. This reverts commit ebcee19783c4fe5ba776353e95974383850a4685. Change-Id: I7c76b9c37a8d919cdf319dae1ae8f444300ed3d4
