tree 6422642f31cd4fa03e324b312c0fde24b47e379f
parent 2f894fec5b22948558b22753cc472d4559bea942
parent 4b81e89d9b7a2cf3ed5aacd9c647aed47f4c4675
author Craig Mautner <cmautner@google.com> 1397679189 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397679189 +0000

am 4b81e89d: am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev

* commit '4b81e89d9b7a2cf3ed5aacd9c647aed47f4c4675':
  Fix ActivityContainer callback parcelling.