| commit | ef5b7f32b1367c07f599f41b6357f2bcdf35e786 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Fri Sep 12 10:04:48 2014 +0200 |
| committer | Sebastien Hertz <shertz@google.com> | Fri Sep 12 10:04:48 2014 +0200 |
| tree | 9fdaaada7ee9ba5e8c80453cd7efabf4eb2d6a38 | |
| parent | 00b022ca2574d3eeacd411e79077203ddc7654e2 [diff] | |
| parent | 6841e3f39dbe42c8ad240793177ab4fcf66ad901 [diff] |
resolved conflicts for merge of 6841e3f3 to lmp-dev-plus-aosp Change-Id: I2f115f3480022b39bff1f5d1ab6f3b9720bc3008