| commit | 3ef52587da6fd91fc12164fd57100d6e352508ec | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Oct 15 13:54:37 2014 -0700 |
| committer | Jim Miller <jaggies@google.com> | Wed Oct 15 13:54:37 2014 -0700 |
| tree | e1f68d2fe7ff6e75c09e7e0c5c3583144b5027ab | |
| parent | 6b68b000da5db8df9228ae9f589dfb1f2b38759b [diff] | |
| parent | 46c7f6d6f32efec26bc9343f591ad1ddbe8f3b4a [diff] |
resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev Change-Id: Ic07a97df04c274bbfa980134c9f4589c65a7ef62