tree 10da860fcff71886af91d082e31f0e1917926848
parent 71b3c339f99bc39f082c56b0b25ea80078dca4fb
parent 32a0aa2ea2970393723edfb239fb9be9b20f1be7
author Adam Cohen <adamcohen@google.com> 1414566271 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566271 +0000

am 32a0aa2e: am a9fe2cb9: am 722719a6: am 27470623: am b93da8d6: am 01c0214f: Merge "Fix bugs / jank with folder creation feedback (issue 11195148)" into jb-ub-now-indigo-rose

* commit '32a0aa2ea2970393723edfb239fb9be9b20f1be7':