tree 10da860fcff71886af91d082e31f0e1917926848
parent 2570c68455139bb9bdff81b7dcbbeef264ac69b1
parent 4c2d760b419dd937ebf86e4962559bc5a3c5a467
author Adam Cohen <adamcohen@google.com> 1422666464 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666464 +0000

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

* commit '4c2d760b419dd937ebf86e4962559bc5a3c5a467':