tree bf7383e7dc4b034b3d2b8620495bb7ae8e1035e2
parent e1d4e2983f129c14ad7c302960ae836b065494ff
parent 5a3fb17474b29cc2b3f17b69f8aa58806a030d18
author Benoit Lamarche <benoitlamarche@google.com> 1481891067 +0000
committer android-build-merger <android-build-merger@google.com> 1481891067 +0000

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

Change-Id: Ib5da55a2d084afdb1a4fda1b3ce6bc8915ba2447