OSDN Git Service

Merge remote-tracking branch 'koush/master' into cm-11.0
authorKoushik Dutta <koushd@gmail.com>
Fri, 29 Nov 2013 17:14:27 +0000 (09:14 -0800)
committerKoushik Dutta <koushd@gmail.com>
Fri, 29 Nov 2013 17:14:27 +0000 (09:14 -0800)

Trivial merge