tree 10da860fcff71886af91d082e31f0e1917926848
parent 9f608c92f43398155272ef01642c3a40acda9cc2
parent 3bcf5892c7206fa4653c65fd49553c2f9d144daa
author Tom Stamm <stammt@google.com> 1414566133 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566133 +0000

am 3bcf5892: 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 '3bcf5892c7206fa4653c65fd49553c2f9d144daa':