| commit | e5a9504442ba0be16b20dc2008bd2017a6669a10 | [log] [tgz] |
|---|---|---|
| author | Jason Parks <jparks@google.com> | Mon Nov 24 11:04:47 2014 -0600 |
| committer | Jason Parks <jparks@google.com> | Mon Nov 24 11:04:47 2014 -0600 |
| tree | 6378098cf34607eb716798542692fbe6ea9a8217 | |
| parent | 8716bb549e149323de1e36281710a414bae8d7c2 [diff] | |
| parent | 34d96de0f826155b7256b03fb42f625fd0bedfbe [diff] |
resolved conflicts for merge of 34d96de0 to lmp-mr1-dev-plus-aosp Change-Id: Ie2c07b08d47186477863c192f0762d6297a038fc