commit | c2389dc906c2b20e597c6ccb20255f5d20182fe0 | [log] [tgz] |
---|---|---|
author | Adam Cohen <adamcohen@google.com> | Wed Oct 29 07:01:42 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:01:42 2014 +0000 |
tree | 10da860fcff71886af91d082e31f0e1917926848 | |
parent | 9bfdc6c7bc9849c2c4ef32190f154e599f21555c [diff] | |
parent | 04925cca77d7b7d3a1a71c0d581e5c78793148e4 [diff] |
am 04925cca: am afe6d85b: 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 '04925cca77d7b7d3a1a71c0d581e5c78793148e4':