tree 74d25dcc479c2e5ad1530dd0848ddd5bc62c6d75
parent 833a08debec6af159130fbc7dd6d01fb28c4ff1e
parent c3c0e9ea90cbb41e931ecd03ba54229ac8b21201
author Teemu Hukkanen <teemu@fairphone.com> 1471006194 +0200
committer Teemu Hukkanen <teemu@fairphone.com> 1471006194 +0200

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

Change-Id: Ifbab5605135d5156c983b6d6f997a4e770cd5bef