commit | 586db9059e135552eb321f9415b2d6d4c5746619 | [log] [tgz] |
---|---|---|
author | Jaap Jan Meijer <jjmeijer88@gmail.com> | Fri Sep 02 15:21:17 2016 +0200 |
committer | Jaap Jan Meijer <jjmeijer88@gmail.com> | Fri Sep 02 15:21:17 2016 +0200 |
tree | 5baf0510176fa328b54e0cfb9f2e4c4de4baa4d6 | |
parent | 9b804f62dd3725eeefeac87dfe80b4b247c52aed [diff] | |
parent | 84206d12500e5619dedca38dc62e498b9b738c1a [diff] |
Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86