tree 7d65450e62e03b9ab6675b884ff60319538b83b1
parent 0770d67667aadb27c4e5669af3ec1d17a59bfb0e
parent df49f2b5fe6474d564c03923069d15d88d1a7f67
author Benoit Lamarche <benoitlamarche@google.com> 1474644052 +0000
committer android-build-merger <android-build-merger@google.com> 1474644052 +0000

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

Change-Id: Id087cd10b61724850a0f882a6d18b22f65e5b37e