| commit | 4a5a11e416425689d9f37a1963ae852051b451d2 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Jul 30 09:53:12 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Wed Jul 30 09:53:12 2014 -0700 |
| tree | 717eecd5acdbdf3fa8f15ac5a2dcecc853be7276 | |
| parent | 1dd586eea2ef7fb14cf212dea327b2f344877363 [diff] | |
| parent | a8138028470048fadb0ecd97c58c83a045875943 [diff] |
resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp Change-Id: I5573d097d741f4922b791b33de5c941af08127c6