| commit | 75c06582d9e7f35a2b1606c3b1a9eedc30308b3e | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Nov 26 10:11:02 2014 -0800 |
| committer | Dan Albert <danalbert@google.com> | Wed Nov 26 10:11:02 2014 -0800 |
| tree | 2f850bfc4ed4114b22b8cefd3de668888b7caa64 | |
| parent | 4881be8c60f0841e5a826f0d2a6d667d3a6286de [diff] | |
| parent | eea839814d4a85709d8bab5b087183307966bda1 [diff] |
resolved conflicts for merge of eea83981 in lmp-mr1-dev-plus-aosp Change-Id: I46e2f1e5578d07cfd2fe7b50bcc4d68f334484c8