| commit | 740c81c81db82568b2ec64e09cf2a4772779c17f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Nov 26 10:10:23 2014 -0800 |
| committer | Elliott Hughes <enh@google.com> | Wed Nov 26 10:10:23 2014 -0800 |
| tree | 896866e44a3711f7ce0000680f62970ba80cd7b5 | |
| parent | 8777f1913d34c3ecf72164ea85292e978e265edd [diff] | |
| parent | eec8af34d3129d0f37c45ff8a82b4212724a6d79 [diff] |
resolved conflicts for merge of eec8af34 to lmp-mr1-dev-plus-aosp Change-Id: I5a9504efe76adf3067103b0e641b3d121a1af4bd