tree 10a9dc9c0d56904fcca27314ee28c77a9e17f433
parent 307d8073c1aa91754d2ffe0ad9de3c3896085998
parent 93d40faa60365a71c83cbbd817e3485db5631ffb
author Teemu Hukkanen <teemu@fairphone.com> 1474462175 +0200
committer Teemu Hukkanen <teemu@fairphone.com> 1474462175 +0200

Merge tag 'refs/tags/r4275.1_FP2_gms65_1.7.1' into fp2-sibon-staging-16.09.0rc1