tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 526d6c3ed24207aab661c3088a74a07c122bde78
parent bb8def3cce2a599ab4de0a558900c48bbbaa274d
author Adam Cohen <adamcohen@google.com> 1422685300 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685300 +0000

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

* commit 'bb8def3cce2a599ab4de0a558900c48bbbaa274d':