commit | e92758418f9b48320e326f72f73a2e76b8f7126a | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Mon Feb 13 14:19:40 2017 -0800 |
committer | Borjan Tchakaloff <borjan@fairphone.com> | Fri Mar 17 15:53:41 2017 +0000 |
tree | 106c55a4cf6427f9656b5da03ed3b1d2a41d78de | |
parent | fc8a293ae1d0c90b717e1c8d968f00b378a3ecd5 [diff] |
resolve merge conflicts of 79cf158c51 to mnc-dev FPIIM-472 Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643 (cherry picked from commit 50358a80b1724f6cf1bcdf003e1abf9cc141b122)