| commit | 592a45c1b5902b2de9638c3882ef285fd52f8cac | [log] [tgz] |
|---|---|---|
| author | Luca Stefani <luca.stefani.ge1@gmail.com> | Fri Dec 09 13:08:00 2016 +0100 |
| committer | Luca Stefani <luca.stefani.ge1@gmail.com> | Fri Dec 09 13:08:00 2016 +0100 |
| tree | bc998e95369212d85280d5476bdb365fa5d6cec3 | |
| parent | b5f28ec9dc3fe7ba9ac6da9a3d5d51fd8e408060 [diff] |
policy_hal: Fix mismerges Change-Id: I19344f9ab589e5e6896888a937bed51174e3fa1d