| commit | 4fd8dabd52587e117cde58b756d5ef0d9696c47f | [log] [tgz] |
|---|---|---|
| author | Andrei Onea <andreionea@google.com> | Thu Jul 25 19:04:15 2019 +0100 |
| committer | Andrei-Valentin Onea <andreionea@google.com> | Thu Jul 25 18:17:30 2019 +0000 |
| tree | 9fc51a5980744d3259a55ac1f3bd2d03271899b1 | |
| parent | 4565dd5de3cabef65262f3433fc76c8f48b3021c [diff] | |
| parent | 130e0ade7b3ed33038518c9eb8329cbee066ef2a [diff] |
resolve merge conflicts of 130e0ade7b3ed33038518c9eb8329cbee066ef2a to stage-aosp-master Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: Ie8cfba397930a1bd5ec947f4834478bb629fa640 Merged-In: I19e5fbfefcf59e0b53b197ea8e9e3cb78439b4c4