tree f326fd8ba07128500e585e502bdb4794642ad267
parent a11d955b8e3bd27bb8c9aefb513b48dad5f82859
parent 098bc61f6c1683c63c5210025e1f65bb41d41037
author Adam Powell <adamp@google.com> 1382721092 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382721092 -0700

am 098bc61f: am fd08694e: am 215add2e: Merge "Hide TransitionManager default transition methods" into klp-dev

* commit '098bc61f6c1683c63c5210025e1f65bb41d41037':
  Hide TransitionManager default transition methods