tree 849bc43efc57e289d5b2cfb363decad946a2a3be
parent 0d3d24ac802b22a34d093d65dfceeef4f2e06111
parent 98288f34aed69390ea4b105e8f73f530ed0b9473
author Jean-Philippe Lesot <jplesot@google.com> 1417546885 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417546885 +0000

am 98288f34: am 9885c8a8: Import Jack and Jill Arzon 1.0-mr1

* commit '98288f34aed69390ea4b105e8f73f530ed0b9473':
  Import Jack and Jill Arzon 1.0-mr1