tree 7246e473718b974d6eb6adef75c1b387191b80d4
parent 06dac5dadc50b024098aaccb09da1b01233e0bcb
parent ba10c979c07344906b2ddafe7c0135491d8ca24b
author Jean-Philippe Lesot <jplesot@google.com> 1423182927 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423182927 +0000

am ba10c979: am e7d70fb1: am 53455632: Import Jack and Jill Arzon 1.0-mr2

* commit 'ba10c979c07344906b2ddafe7c0135491d8ca24b':
  Import Jack and Jill Arzon 1.0-mr2