tree 96d733fb64653f5b7aeb7522301d13b508cde4ea
parent 8a2558b6a702c149a5a74015b5d06e9f0a521c20
parent cf6bfe63d3a5ca6df77d2a2fe5327772a2b9bc1d
author Benoit Lamarche <benoitlamarche@google.com> 1474636044 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1474636045 +0000

Merge "Import Jack and Jill Carnac 1.3-b4 for Dogfood"