| commit | 3bcf5892c7206fa4653c65fd49553c2f9d144daa | [log] [tgz] |
|---|---|---|
| author | Tom Stamm <stammt@google.com> | Thu Oct 23 17:27:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:27:26 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 0084f0cb4de5e709596e8c380090fa2b4d3838cc [diff] | |
| parent | 043d74855cc1cd4fe06d4b98a46f25cad020dd4b [diff] |
am 043d7485: am af787b56: am 3b50e694: am 67a40e08: am 339b0ec9: Merge "Trying to come up with a simpler approach for onShow/onHide." into jb-ub-now-indigo-rose * commit '043d74855cc1cd4fe06d4b98a46f25cad020dd4b':