| commit | 66acb2a8ae0d41dc9cd6752b50059d8c8efc1b83 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon Oct 20 13:37:18 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Mon Oct 20 13:37:18 2014 -0700 |
| tree | c90b5aae68159b2416f862f7beb4e17c3eb61390 | |
| parent | 554e514c21653d3973d79c4e59d14b21dab42b47 [diff] | |
| parent | 96c22133af53974a8e55412840338c2e29140298 [diff] |
resolved conflicts for merge of 96c22133 to lmp-dev-plus-aosp Change-Id: I35a2f403e9e664536b45b5ac9185adf1e1a02442