tree b2bb2885b39db54be071cad95ad216332f9815e9
parent 35acb934f3737feb460659a3f39268029f4f84ac
author Xavier Ducrohet <xav@google.com> 1414012848 -0700
committer Chris Banes <chrisbanes@google.com> 1425589702 +0000

Plugin 0.13.4 DO NOT MERGE

Change-Id: I3758b259b7d32f95a7355a5b7fb0ef30080c6b7e