| commit | fe11d50587a8ddaee49e66dc7a6a982e85b82424 | [log] [tgz] |
|---|---|---|
| author | Nick Desaulniers <[email protected]> | Mon May 13 12:49:38 2019 -0700 |
| committer | Nick Desaulniers <[email protected]> | Mon May 13 12:49:38 2019 -0700 |
| tree | 21ac82caba61168452ca310420406cbf99be99ae | |
| parent | 6c4ea71ed22a152e7bbb4b228f5600a92ed8f1d4 [diff] | |
| parent | de7a0a152648d1a74cf4319920b1848aa00d1ca3 [diff] |
Merge commit 'de7a0a152648d1a74cf4319920b1848aa00d1ca3' This merge commit was generated via: $ git merge --allow-unrelated-histories \ de7a0a152648d1a74cf4319920b1848aa00d1ca3 It was needed to re-establish history from the upstream-master branch which tracks and autopulls from upstream llvm/llvm-project. Bug: 131714073 Bug: 132372833 Signed-off-by: Nick Desaulniers <[email protected]> Change-Id: I9756f43eb86ea2f17e08bd04362e6efa70a825b8