tree cf5b1ba47a0d0e0d9e8bf527f814fa54841f8eb8
parent 55c0f49cf185a9457acd32d6e5f3a79900983702
parent 6132a3884a912a704010f22ea2991f3d9d432af2
author Nicolas Geoffray <ngeoffray@google.com> 1450366595 +0000
committer android-build-merger <android-build-merger@google.com> 1450366595 +0000

Merge "Fix braino in parallel move resolver."
am: 6132a3884a

* commit '6132a3884a912a704010f22ea2991f3d9d432af2':
  Fix braino in parallel move resolver.