tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent cbe7025e590b93d98d344ee845991f665b38df3b
parent 355e075a2cf7a97acce2102a7ccc46b28861031f
author Adam Cohen <adamcohen@google.com> 1392410999 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410999 +0000

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

* commit '355e075a2cf7a97acce2102a7ccc46b28861031f':