tree c15fc941a4a2e0adc6f8e5703a93c10b279902a6
parent 8a9c9c554b4606d2d2e83635a2ac8877dca71f75
parent ac126f31f93f0c12c3e487ea16e05ef1ded7c6de
author Sebastien Hertz <shertz@google.com> 1484319564 +0000
committer android-build-merger <android-build-merger@google.com> 1484319564 +0000

Merge "Revert "Import Jack and Jill Douarn 1.3-b16 as Stable"" am: 0a576103f3 am: 4d8fd0a0b6
am: ac126f31f9

Change-Id: Ic2560bf550ecc71e1fd088390430b97a9e8a8ee6