| commit | e27370cbc7549c494814ebb395a2f0757ffaa641 | [log] [tgz] |
|---|---|---|
| author | Geoff Lang <geofflang@google.com> | Thu Jan 30 11:27:26 2020 -0500 |
| committer | Geoff Lang <geofflang@google.com> | Thu Jan 30 11:27:26 2020 -0500 |
| tree | 34e03af72a92cc8ac98bf178c8598090af4141fd | |
| parent | ee07cb317579dfda40dabb5d6d9c209e0e9e0643 [diff] | |
| parent | 77d9d0d3001c841882d963811284209adc45c8bf [diff] |
Merge remote-tracking branch 'aosp/upstream-mirror' into aosp-master Exempt-From-Owner-Approval: merge from upstream Change-Id: I6ac53dcb2e1289a34db477d776670452d26562f4