| commit | 5c2345ae29b594729c5d8d1941ac2df691bba827 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Aug 13 13:01:16 2018 -0700 |
| committer | Xin Li <delphij@google.com> | Mon Aug 13 13:01:16 2018 -0700 |
| tree | 6e09d97e5d3d3fc35bb7e1b03d0c8cceb2ca9a86 | |
| parent | 658da9b7b540aa7bcf8aa05cd65fb83556f0dfe2 [diff] | |
| parent | cd5fe8c96a9887a9d869599b6df69e79ea6f95f6 [diff] |
Merge stage-dr1-aosp-master into stage-aosp-master Bug: 112535855 Change-Id: I8c6b4e7ca2f4399d6aade59cf9782cf0e1e977aa