OSDN Git Service

Merge remote-tracking branch 'koush/master' into cm-11.0
authorKoushik Dutta <koushd@gmail.com>
Sun, 12 Jan 2014 19:55:05 +0000 (11:55 -0800)
committerKoushik Dutta <koushd@gmail.com>
Sun, 12 Jan 2014 19:55:05 +0000 (11:55 -0800)

Trivial merge