tree 98da3b2d8b6d18a71c150e317e1929354d2cad60
parent 7f7d5957df80256240c978dc83186b890aa3c219
parent 955c65bddf4f2cf50f91579f90f997205d0af48f
author Teemu Hukkanen <teemu@fairphone.com> 1471006563 +0200
committer Teemu Hukkanen <teemu@fairphone.com> 1471006563 +0200

Merge tag 'r4275.1_FP2_gms59_1.5.1' into fp2-sibon-staging-16.07.00rc2