OSDN Git Service

Merge "Fix braino in parallel move resolver." am: 6132a3884a
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 17 Dec 2015 23:39:16 +0000 (23:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Dec 2015 23:39:16 +0000 (23:39 +0000)
commit711159d4cc0556fb219acf8830ca254d2f57f461
tree6b3052d87db810ac722a0f631049e04f0135a7ef
parent9db74431102582adfe185de6d96c7796b251a07c
parentab971e37cfecf46e33fd09ce3d18d7b95112818c
Merge "Fix braino in parallel move resolver." am: 6132a3884a
am: ab971e37cf

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