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)
NO_REF_TASK
tested: local run

Change-Id: If6523ccd94baeec109b4cbe477760aef479571f0


Trivial merge