OSDN Git Service

Merge "Add support for eagerly calculating conflict tables" into nyc-dev
authorMathieu Chartier <mathieuc@google.com>
Fri, 22 Apr 2016 20:41:59 +0000 (20:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Apr 2016 20:41:59 +0000 (20:41 +0000)
commit486d56de96496f2c15d019a732cfc2e52774bb9b
tree53f2230855956aaa8ad872d81862e558ba8fb576
parent048423864ba3d964af7ad3a5292632cebf9dc0ad
parent257670ee2c2f2e39d75dd65e00e27dcccd4e6e9b
Merge "Add support for eagerly calculating conflict tables" into nyc-dev
am: 257670e

* commit '257670ee2c2f2e39d75dd65e00e27dcccd4e6e9b':
  Add support for eagerly calculating conflict tables

Change-Id: I53c88dbaa0639620ce52481c3433eb40a9da6764