| commit | aa809c64767a2a8e34d333550dd981de19802ffb | [log] [tgz] |
|---|---|---|
| author | Pekka Pesu <pekka.pesu@nedevicesw.com> | Tue Nov 08 17:34:28 2016 +0200 |
| committer | Pekka Pesu <pekka.pesu@nedevicesw.com> | Tue Nov 08 17:34:28 2016 +0200 |
| tree | be92740709db5bbecf51b5e2a9b6ce88645f3b53 | |
| parent | 7d2adc35606c56036f32b4d1c3996183ae927be5 [diff] | |
| parent | db479267874f5ff09da374325a16d14c3d42a89b [diff] |
Merge commit 'db479267874f5ff09da374325a16d14c3d42a89b' into FPIIM_WIP Conflicts: AndroidBoot.mk app/aboot/aboot.c Change-Id: I9de2270b8fc1b50883241042db9361166d6ddb64