| commit | 35e83b120fef310f55233b107707f244ded35e4a | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Mon Oct 30 12:29:04 2017 -0700 |
| committer | John Stultz <john.stultz@linaro.org> | Mon Oct 30 12:31:21 2017 -0700 |
| tree | d7a96e86cc8ecace9a54507f18d3d2e86e97cc5f | |
| parent | 16164a6d52c3ce842891d64420b119fe8410fe29 [diff] | |
| parent | a4d118e0b9b576a2ff08c088aac2a755acd8400b [diff] |
Merge branch 'github/hikey960-v2.5/update' into update-bootloader Big transition to upstream edk2 code. This merges the aosp/master code with a4d118e0b9b5 but merges such that the tree should be identical with the a4d118e0b9b5 side of the merge. Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I2bc9700c15ee79a734ec4930df6f40fbad70c4cf