tree c518e36d0c4ad2616c32304a1fbcef73cc77711f
parent fdeab3203c944d2fdc205c506262da25f9d2bc57
parent 178879c72dad2b0dd85e77267281dee26907bfff
author Adam Cohen <adamcohen@google.com> 1408485864 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408485864 +0000

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

* commit '178879c72dad2b0dd85e77267281dee26907bfff':
  Updating folder open transition for Material