tree d16befb784ac05f3b4d844230d24fb7c67cbdd93
parent ad0856abaa3634176157a74ba6d093a982ee2330
parent e3a29c5e1d7029de6e63b75b6a745ee669897779
author Sebastien Hertz <shertz@google.com> 1484579913 +0000
committer android-build-merger <android-build-merger@google.com> 1484579913 +0000

Merge "Import Jack and Jill Douarn 1.3-b17 as Stable"
am: e3a29c5e1d

Change-Id: If113415860d26047a2aa9e643e746ea55d1cf16d