| commit | 40fbf571dee4d9ad5bccea6813988198a6f47e40 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Aug 13 13:01:13 2018 -0700 |
| committer | Xin Li <delphij@google.com> | Mon Aug 13 13:01:13 2018 -0700 |
| tree | d5c0cad44e17713cfc173de7cd8b0ec086e10e6e | |
| parent | ab02a10e9fcaabce0de91f2f56b23f000af9bec5 [diff] | |
| parent | 78c0240fffd9f4ad434fe37e55e0aa75e543c310 [diff] |
Merge stage-dr1-aosp-master into stage-aosp-master Bug: 112535855 Change-Id: Ie289855048ac1df4a939c62b4048f46e04e8d119