| commit | 043d74855cc1cd4fe06d4b98a46f25cad020dd4b | [log] [tgz] |
|---|---|---|
| author | Tom Stamm <stammt@google.com> | Fri Feb 14 20:50:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:50:41 2014 +0000 |
| tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
| parent | a671c28cbfbb524a164e665fea0c27beea328708 [diff] | |
| parent | af787b5607c5a25779e49f6ce94a6cb73601d227 [diff] |
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 'af787b5607c5a25779e49f6ce94a6cb73601d227':