tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent cbe28fb700d18b2ab2348534c2ccafb035382dc5
parent 91e18ddec4bb9eb3b41d2bc29343360fdbf270e5
author Adam Cohen <adamcohen@google.com> 1392410127 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410127 +0000

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

* commit '91e18ddec4bb9eb3b41d2bc29343360fdbf270e5':