tree 6c14c555534813b473a6ee19d1b39f9920f0f38f
parent d652526fbef1b39c7e1ad8602fb9f13c4753bca6
parent 7a2cd21aea615bf22c4c9be64c0ba7accc4fdcc2
author George Mount <mount@google.com> 1410189054 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410189054 +0000

am 2c84e65e: am 850bca01: Merge "Only call setHasTransientState in captureHierarchy." into lmp-dev

* commit '2c84e65e87d266a7d9b15a9e6719b9f14137fd45':
  Only call setHasTransientState in captureHierarchy.