tree bf7383e7dc4b034b3d2b8620495bb7ae8e1035e2
parent c7bc85cba6f3bc1c4717d5f62905c4dbc3e6dfd4
parent 5f5c73724016c7bae7ca74824c99ee02df254723
author Benoit Lamarche <benoitlamarche@google.com> 1481892120 +0000
committer android-build-merger <android-build-merger@google.com> 1481892120 +0000

Merge "Import Jack and Jill Douarn 1.3-b15 as Stable" am: 5a3fb17474 am: fe4e8c7f02
am: 5f5c737240

Change-Id: I3f840c35bb7abc656bd005e4bdff90c4eadf652c