OSDN Git Service

Merge remote-tracking branch 'github/cm-10.1' into cm-10.2
authorKoushik Dutta <koushd@gmail.com>
Thu, 8 Aug 2013 17:39:46 +0000 (10:39 -0700)
committerKoushik Dutta <koushd@gmail.com>
Thu, 8 Aug 2013 17:39:46 +0000 (10:39 -0700)

Trivial merge