tree 3d3937a2e4b5fe7164ba403ddfd6dd8f0f025584
parent 35ef6aae304e4b62f492a2ac7f05c986c7fe6a6b
parent def01fb8dc7da0d8287603ed5694ebe028640dcb
author Adam Cohen <adamcohen@google.com> 1380567767 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380567767 -0700

am def01fb8: Merge "Trying to get onShow in all the right places" into jb-ub-now-indigo-rose

* commit 'def01fb8dc7da0d8287603ed5694ebe028640dcb':
  Trying to get onShow in all the right places