tree f554b7277e4836c7ca39ae3d85d33ae538f888d8
parent 84f0acaf404567faf902bb6c2be83cac54f98595
parent e521aad3a5bd81e687dec0e73739672ab3cde7f9
author Craig Mautner <cmautner@google.com> 1348853859 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348853859 -0700

am e521aad3: am af08ccb2: Merge "Add null checks before using mViewMediatorCallback." into jb-mr1-dev

* commit 'e521aad3a5bd81e687dec0e73739672ab3cde7f9':
  Add null checks before using mViewMediatorCallback.