| commit | 84f838d71a75125b14d361f0ed7d23a0ac521edf | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Fri Apr 13 16:31:33 2018 -0700 |
| committer | John Stultz <john.stultz@linaro.org> | Fri Apr 13 16:31:33 2018 -0700 |
| tree | a7694dfdab2ca2b1d32e25071589c7ea0a992bd6 | |
| parent | 2f9aea0661550a43c3d2ac33a5bc286870edd34e [diff] | |
| parent | 35affe89d5f617a972b1cfee00c51cbe9e7c64a2 [diff] |
Merge remote-tracking branch 'freedesktop/master' into aosp/master This merges the freedesktop/master branch into aosp/master Change-Id: I3104d45924f67d37808154d04c15518394204478 Signed-off-by: John Stultz <john.stultz@linaro.org>