OSDN Git Service

Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Fri, 2 Sep 2016 13:20:04 +0000 (15:20 +0200)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Fri, 2 Sep 2016 13:20:04 +0000 (15:20 +0200)
commitd466bad744acd9fcda345c898e6911f4c72a4673
tree46671721c5bfbcc5d637544d265e2d96b51ae9c7
parent0b8c2ea3ec8ed3a086bd02d3246e06564e8a64cb
parent2c8f0bd3af14b5ad856412098ed62eac537800b4
Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
AndroidManifest.xml