tree 950bf6a7d3c7d3990dad0c927726d3d01d2637f4
parent 871e69520d6c97be09550f08ad9de04634a3cdd3
parent 2c4be2a40d2bbf19b3929147195bc5a1c4c525b9
author Benoit Lamarche <benoitlamarche@google.com> 1474643005 +0000
committer android-build-merger <android-build-merger@google.com> 1474643005 +0000

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

Change-Id: I7b5984f83856b5c8a18164a0ddb31a5cdf2937d8