tree fad39678cb4f50942e02eecdbe5853d3689d3ea0
parent cdbb9d919a57996e2516ce0a9e204ab76d6039ae
parent b1d615de4ef076c28c435b27f17f11c751a6c8a3
author Benoit Lamarche <benoitlamarche@google.com> 1474643216 +0000
committer android-build-merger <android-build-merger@google.com> 1474643216 +0000

Merge "Import Jack and Jill Carnac 1.3-b5 for Dogfood" am: 2c4be2a40d am: 34dfcb316f
am: b1d615de4e

Change-Id: I5040c808599fc41725f0d00a8f7847e064ccfef1