| commit | 2a0f42b58d41d2c115ba79d98605bd73bd5ab6ef | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Sep 24 15:56:29 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Wed Sep 24 15:56:29 2014 -0700 |
| tree | da32695d1cd889eec7a31cbce4ae69e532f80ce6 | |
| parent | 0eed2eb64a229d83859155889fdba14b0f429dc2 [diff] | |
| parent | 64884bb1352bb76ee5fa55ac04743678bdf4b180 [diff] |
resolved conflicts for merge of 64884bb1 to lmp-dev-plus-aosp