| commit | 69f2c0128d2b3832c75cced940edb8dc8f2d9d68 | [log] [tgz] |
|---|---|---|
| author | Alistair Strachan <astrachan@google.com> | Wed May 16 11:07:40 2018 -0700 |
| committer | Alistair Strachan <astrachan@google.com> | Wed May 16 12:30:45 2018 -0700 |
| tree | 148a245dc7d21a5eeb7ded9e3a036403dc2a087a | |
| parent | 4186e8bbdec00546f0af20ee2da557e7fcfe127a [diff] | |
| parent | 5d3caa1ca449082bebaf1ce919917ff19d0482e0 [diff] |
Merge branch 'aosp/upstream-18.0' Squashes down these Change-Ids: I73eeba6dabfa83a4404c8371ae39ad0c26b73102 Ica4a80c917beb990b5df18f9bee591ce3cfc9f42 Bug: 79165890 Change-Id: Iec064b10e8ea5a08d57e8660bc9f6a7fb35d02da Signed-of-by: Alistair Strachan <astrachan@google.com>