OSDN Git Service

Merge remote-tracking branch 'cm/cm-13.0' into jide_x86_lollipop
authorWuZhen <wuzhen@jidemail.com>
Wed, 6 Jul 2016 12:16:00 +0000 (20:16 +0800)
committerWuZhen <wuzhen@jidemail.com>
Wed, 6 Jul 2016 12:16:04 +0000 (20:16 +0800)
commit2a7837a7458e4b33a207a0b1f6c64152992c1dac
tree3392a73b6d365ffb6e7af2e72b90cfe905174117
parenta17e3e9eddffbea32288d75ad22ed7a9fc23227c
parent4f5545a5df7fbc14aaaa00c707fd6c9e6e606b43
Merge remote-tracking branch 'cm/cm-13.0' into jide_x86_lollipop

NO_REF_TASK
tested: local run

Change-Id: If6523ccd94baeec109b4cbe477760aef479571f0