tree e86fbb086f25f6ee58863e76d3a8927a02e67346
parent 896c4656ba3c2e2cdff2719adb7b0a5ed5935815
parent c4cf82186a15089f170f4e7be481732624f52979
author Sebastien Hertz <shertz@google.com> 1484590431 +0000
committer android-build-merger <android-build-merger@google.com> 1484590431 +0000

Merge "Revert "Import Jack and Jill Douarn 1.3-b17 as Stable"" am: ca8559d119
am: c4cf82186a

Change-Id: I86d7f5f928609733102645472076e9aa6d9fb740