tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 5607bbbfb169a38db337c429fbca72f3c810a240
parent c9e39687a7b3cecf9c3c675a153f9aab7bcb8c01
author Adam Cohen <adamcohen@google.com> 1422669682 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669682 +0000

am c9e39687: am 4c2d760b: am 178879c7: Merge "Updating folder open transition for Material" into ub-now-porkchop

* commit 'c9e39687a7b3cecf9c3c675a153f9aab7bcb8c01':