| commit | 0fa01c38cc2beff8d7e11e4b512692ecdb640ca8 | [log] [tgz] |
|---|---|---|
| author | Sen Jiang <senj@google.com> | Thu Aug 09 16:52:23 2018 -0700 |
| committer | Sen Jiang <senj@google.com> | Fri Aug 10 11:07:06 2018 -0700 |
| tree | 279e9e692e3a7db704f65e6d3977e43e8e75b46a | |
| parent | b5f20f52ab0885f1676b1c2024df541b3e6cc5f5 [diff] | |
| parent | 904c2c9cd8d5ff06783030fb27ee23dcff743035 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into aosp/master. Merge Chromium ToT to AOSP: git fetch aosp upstream-master git merge -X patience aosp/upstream-master Bug: 112326236 Test: libbrillo_test Change-Id: I35fbbddad556b051ce12b9cdd95bb2afef3cf6af