tree 90fd108dd6580228b2516c0ddc73e0bc4b2289f7
parent c4e9520df8f93cbe0c1b5cbe780ff304689271f9
parent 4080eeea2573b6531c4afd8e4675c1ed43cfd0de
author Dirk Vogt <dirk@fairphone.com> 1465386872 +0200
committer Dirk Vogt <dirk@fairphone.com> 1465386891 +0200

Merge remote-tracking branch 'origin/fp/fp2_5.1_int'

Change-Id: I73c220acaa16db317f36fedd2e276e2f918266d2