| commit | d7ecd0d24deca918159c700bcd2ea00713766e36 | [log] [tgz] |
|---|---|---|
| author | Andrei Onea <andreionea@google.com> | Mon Jul 22 16:13:31 2019 +0100 |
| committer | Andrei Onea <andreionea@google.com> | Mon Jul 22 17:56:59 2019 +0100 |
| tree | ef0062a962ef8432b4ee25c94e4bc360a552c78c | |
| parent | 736173bba2b9ada571223e4b3ab6fb1570968c5e [diff] | |
| parent | 1faafcb48830a01765c9b84792505565a6d3fafb [diff] |
resolve merge conflicts of 1faafcb48830a01765c9b84792505565a6d3fafb to stage-aosp-master Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I055f014081e454b1dcfb8523a0387d7bc4b4ff9a Merged-In: I981067477f6f4aa435459c0bc9a52099e6f5d445 Exempted-From-Owner-Approval: merge conflict resolution