| commit | ebcee19783c4fe5ba776353e95974383850a4685 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Mon Aug 12 17:08:28 2013 +0000 |
| committer | Scott Main <smain@google.com> | Mon Aug 12 17:08:28 2013 +0000 |
| tree | 5ce250ecc04a5bcd4caebf0f63ae98e12b4e595c | |
| parent | 385bb2eb5184686c2d953fe4757522e61acb3392 [diff] |
Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later. This reverts commit 385bb2eb5184686c2d953fe4757522e61acb3392. Change-Id: Ie0a995b185c3354ff369fce87f73810c1027a0b2
