| commit | 9a920fd97915a2341b8bdac96a6bfb2f4906c15d | [log] [tgz] |
|---|---|---|
| author | Paul Westbrook <pwestbro@google.com> | Sun Nov 02 11:10:17 2014 -0800 |
| committer | Paul Westbrook <pwestbro@google.com> | Sun Nov 02 11:10:17 2014 -0800 |
| tree | 60521618e3c3f319439f825e83da1b9ae577191f | |
| parent | ded6357d8a248e4f57777352c9b58ef9000d56a1 [diff] | |
| parent | 7dd59de700efa7f7b8bffa7fe799dbd0493bd550 [diff] |
resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp Change-Id: I877043f64b96b9073652f7cec90bff08dd6e69f5