tree ef957db3fd0e638e5e422db5fb798379f461e4e1
parent 43039253c7994ca26a0c20a691ab681bab810e28
parent 1b5ce1cf25610d552498f0d649b466b70b3fc06c
author mikaelpeltier <mikaelpeltier@google.com> 1433860756 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433860756 +0000

am 1b5ce1cf: Import Jack and Jill Brest 1.1-rc3

* commit '1b5ce1cf25610d552498f0d649b466b70b3fc06c':
  Import Jack and Jill Brest 1.1-rc3