| commit | f03824814b1969300daa64195178f558980f9547 | [log] [tgz] |
|---|---|---|
| author | Sungtak Lee <taklee@google.com> | Thu Aug 06 11:32:21 2020 -0700 |
| committer | Sungtak Lee <taklee@google.com> | Thu Aug 06 11:32:48 2020 -0700 |
| tree | af609b5a9485c16d4a739350c000ee7a4ecdd718 | |
| parent | 5555914fd7bec992c1d92db0c0e1eb656421a2ca [diff] | |
| parent | f1e06c0a1230356f6fc2ab39a0e56e97f6d65193 [diff] |
[DO NOT MERGE] resolve merge conflicts of f1e06c0a1230356f6fc2ab39a0e56e97f6d65193 to rvc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Bug: None Merged-In: I4f79427ceeaec1b823270bbc8f2513ed28ea8f67 Change-Id: Ia262d3b763fe2251d7588a0edfcd00100ac62c01