OSDN Git Service

am 67a40e08: am 339b0ec9: Merge "Trying to come up with a simpler approach for onShow...
authorTom Stamm <stammt@google.com>
Thu, 3 Oct 2013 22:35:17 +0000 (15:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Oct 2013 22:35:17 +0000 (15:35 -0700)
* commit '67a40e08c6a24866dd11299c05458323a8eacafb':
  Trying to come up with a simpler approach for onShow/onHide.


Trivial merge