| commit | 307218c7f2e3edac95c2d4d31fa3beadcde3d30c | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Nov 21 09:57:52 2014 -0800 |
| committer | Andreas Gampe <agampe@google.com> | Fri Nov 21 09:57:52 2014 -0800 |
| tree | 9c004075a42515e399db4833a3b89bd002ebd11f | |
| parent | 55dbf00fd8f3931c41b580c7a6b78bf6c2a64de3 [diff] | |
| parent | 09910723c5ad434281d12e6625e0b4175d97ef2c [diff] |
resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp Change-Id: I4b47723a9314bf9bef08e68ce269038d0d50c5d9