Merge remote-tracking branch 'google/release' into develop
authorAndreas Schuh <andreas.schuh.84@gmail.com>
Sun, 30 Mar 2014 14:44:24 +0000 (15:44 +0100)
committerAndreas Schuh <andreas.schuh.84@gmail.com>
Sun, 30 Mar 2014 14:44:24 +0000 (15:44 +0100)

Trivial merge