tree b55fc90cbf2b170dfc70c5d6ca9a2562ddd75250
parent 693236b367050f40b02ab22991d30eb260ec53ea
parent 568356ff9a1deab794d329f8c2e245f5a564a2f3
author Gus Prevas <kprevas@google.com> 1427288566 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427288566 +0000

am 568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev

* commit '568356ff9a1deab794d329f8c2e245f5a564a2f3':
  Changes callback to a WeakReference in ActivityContainerCallback.