tree 69ba0070a2d198bafa9529e622616cd9d0a33d8e
parent dac024b2c766bd7edac940a8f48cb31e232b75cc
parent 6e73f19e3f6309822934ae787b3915dd7d2863a6
author Benoit Lamarche <benoitlamarche@google.com> 1476779227 +0000
committer android-build-merger <android-build-merger@google.com> 1476779227 +0000

Merge "Import Jack and Jill Douarn 1.3-b7 for Dogfood" am: ccc9bd8c29 am: d0bc3fc126
am: 6e73f19e3f

Change-Id: If4b09bebe3191fc62b6cde6c934f5194eebfbab1