tree 9ad9fd08abcdb428c6ae62a2ae226333e655d28c
parent 148c95c9cc57926f3cd50e361b9dc9b801602cb0
parent 80a75611236b2e2254c2ef2f4e2aac74d245e721
author Sebastien Hertz <shertz@google.com> 1484304368 +0000
committer android-build-merger <android-build-merger@google.com> 1484304368 +0000

Merge "Import Jack and Jill Douarn 1.3-b16 as Stable" am: 760a6e1609 am: e36dd7b2f1
am: 80a7561123

Change-Id: I73b0344f85ded6ca11abb3a670de9732b7db7d1c