| commit | 46e957203f4eb1e733f24d4b39a7c340376c9b56 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Wed Sep 17 12:15:44 2014 +0200 |
| committer | Sebastien Hertz <shertz@google.com> | Wed Sep 17 12:16:26 2014 +0200 |
| tree | 934d9402a067aff6926c987b0c2c7d8e3c3a871e | |
| parent | c3c94bce213757f2ed71a757f6d327fa4c2ab777 [diff] | |
| parent | 293f32481f69596a53587bbcffb76ccb51dd1f41 [diff] |
resolved conflicts for merge of 293f3248 to lmp-dev-plus-aosp Change-Id: I44afa96a8c0a024d522f195316e0406abe614cbc