tree 8e4c952227cdddf3630022f23a35b6390aeb0367
parent 6793453ba5817ec33cea95340737dc313a2351ff
parent 00c3184fa6fae69123d160b92977799a1a47fa34
author Jorim Jaggi <jjaggi@google.com> 1389781898 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389781898 -0800

am 00c3184f: Merge "Fix NPE in Workspace.onDropCompleted" into jb-ub-now-kermit

* commit '00c3184fa6fae69123d160b92977799a1a47fa34':
  Fix NPE in Workspace.onDropCompleted