| commit | 305692f800f607c49d3234dd7a243a1659143183 | [log] [tgz] |
|---|---|---|
| author | Budi Kusmiantoro <budi@google.com> | Thu Oct 09 14:39:56 2014 -0700 |
| committer | Budi Kusmiantoro <budi@google.com> | Thu Oct 09 14:39:56 2014 -0700 |
| tree | 4a01561ef41ff0e928714835b1021c8f5ad180fe | |
| parent | 090a567fc1d6678f359b76a9941a8711eaf52960 [diff] | |
| parent | 104bdcc28cbea285e77398df5b72d82b491d54e0 [diff] |
resolved conflicts for merge of 104bdcc2 to lmp-mr1-dev Change-Id: If6c2f3cbb6be237799c64c95fa46266c06522329