tree fa163c35d79aa58133d5d296371627fe8c81d22e
parent 46170088ab19cc74e55b13db4a5c95ea76548f1a
parent 53455632242b4e594d27b34679edf3a1ebaf3d7f
author Jean-Philippe Lesot <jplesot@google.com> 1423180372 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423180372 +0000

am 53455632: Import Jack and Jill Arzon 1.0-mr2

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