tree b2bb2885b39db54be071cad95ad216332f9815e9
parent c4c2d0b88d49be607214edec73d938b447e37944
author Xavier Ducrohet <xav@google.com> 1414012848 -0700
committer Xavier Ducrohet <xav@google.com> 1425680933 -0800

Plugin 0.13.4 DO NOT MERGE

(cherry picked from commit ecdc0dfaad0cf8566648f054070ce84ae70fd2cb)

Change-Id: Ieef5b3b291de35dc998d9e46f0a04ba966475b5a