tree bd6b4814b7625d5f8a00058cd33b2824b617bf8c
parent 7d46ba53a735c46b680d9b9718ff27e3480a994a
parent 45bb6e8361c8bc0fba0fb2b3b07d633b6b33eb4c
author Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> 1504892430 +0200
committer Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> 1504892430 +0200

Merge remote-tracking branch 'lineageos/cm-13.0' into replicant-6.0