tree ccfb9d283e58dc5d2636ef565b0f38554d81907c
parent b59d3547cb256581357a7f9e2df5df102fb95b76
parent 5c410a1072991fd158e809ddb015f1d81ebe11a7
author Yohann Roussel <yroussel@google.com> 1464186628 +0000
committer android-build-merger <android-build-merger@google.com> 1464186628 +0000

Merge "Import Jack and Jill Douarn 1.3-b2 for SDK and Dogfood" am: a656b1ee12
am: 5c410a1072

* commit '5c410a1072991fd158e809ddb015f1d81ebe11a7':
  Import Jack and Jill Douarn 1.3-b2 for SDK and Dogfood

Change-Id: I89ed6d586c98b8b2c3b20be31019fc405344eb8a