| commit | e3a5f1e4a5bcf2ad2a1be907c159ccf07efcf487 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Mon Sep 22 10:09:01 2014 +0200 |
| committer | Sebastien Hertz <shertz@google.com> | Mon Sep 22 10:09:01 2014 +0200 |
| tree | fab2207a92955a02ebbf4299fd526d7db8bf91ef | |
| parent | 430e2b1d9f24c33fa452adfdb69079c32c4af8da [diff] | |
| parent | 4e94fe3e9aeb1ee777e8dd5d677f750650d6bb35 [diff] |
resolved conflicts for merge of 4e94fe3e to lmp-dev-plus-aosp Change-Id: I9d827debec0eea3d10cc04319f1e15bf8d904d55