| commit | cca75cc9c6a64d386511b474c56085ff2620a470 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Sat Sep 19 16:09:53 2015 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Sat Sep 19 16:13:00 2015 -0700 |
| tree | a30ab17f46e6a561c754b89bfbb9b2889f6d3eab | |
| parent | 5ebdf2ca1018d16f623b98061788ac08a4de818c [diff] | |
| parent | cf676a8686d5c71432beead66f6270f33116cb63 [diff] |
resolved conflicts for cf676a86 to lmp-mr1-ub-dev Change-Id: Ifd9a44777a472ae893f894391bff7ef81456d92c