tree e86fbb086f25f6ee58863e76d3a8927a02e67346
parent fba26ced4ba4d171aab3d0cbf23427810e198717
parent 6a09d166915f633a2dd9acfb6267f479f5a10c61
author Sebastien Hertz <shertz@google.com> 1484591070 +0000
committer android-build-merger <android-build-merger@google.com> 1484591070 +0000

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

Change-Id: I5a2600d5f685566cdab5b21a4e3d5e8691deee3b