tree 6b3052d87db810ac722a0f631049e04f0135a7ef
parent 9db74431102582adfe185de6d96c7796b251a07c
parent ab971e37cfecf46e33fd09ce3d18d7b95112818c
author Nicolas Geoffray <ngeoffray@google.com> 1450395556 +0000
committer android-build-merger <android-build-merger@google.com> 1450395556 +0000

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

* commit 'ab971e37cfecf46e33fd09ce3d18d7b95112818c':
  Fix braino in parallel move resolver.