tree 10da860fcff71886af91d082e31f0e1917926848
parent 507eddfeaece803f4e8925c756b5f61a3caefc3f
parent 69bae12252c670ca111708f414b559c5d5dddf8f
author Michael Jurka <mikejurka@google.com> 1414566340 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566340 +0000

am 69bae122: am ee0ff061: am fcb9033a: am c85a63c5: am 1beeb0aa: Merge "Revert "Workaround for remove stuck (issue 11080792)"" into jb-ub-now-jolly-elf

* commit '69bae12252c670ca111708f414b559c5d5dddf8f':