| commit | bb6f8329a0a242908dc0b65b031aecc415e5c32a | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Thu Aug 22 18:01:13 2019 +0100 |
| committer | Santos Cordon <santoscordon@google.com> | Thu Aug 22 22:23:16 2019 +0100 |
| tree | 5122ed590463ba64c177e0922a524fb196464839 | |
| parent | 90b0395647bce7fab82289b65ffdf9b251224c40 [diff] | |
| parent | bd592e043991a525dd6ecf95acd8f50052bb22e2 [diff] |
resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I9819adf76d6c96c54a02670a1d601a329003eb12