| commit | da151bb3afeb9d1322e9b99a7e06be8b966fa140 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Sep 12 17:34:47 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Fri Sep 12 18:22:44 2014 -0700 |
| tree | 3fa593b79b582796a0cdd024513d9a48a8cdf4e6 | |
| parent | 39faf87edf157be27d75e999e47daab182a76869 [diff] | |
| parent | e0f7df2c4d2d559b8ab4e705153cd32cdbdd98dc [diff] |
resolved conflicts for merge of e0f7df2c to lmp-dev-plus-aosp Change-Id: I1e2d3643d2b02746dc1e2c991732013ba4225df9