| commit | 1b5577b44a1ed313b252de3493e7dc6ff5206faa | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jul 26 15:07:54 2018 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Thu Jul 26 15:07:54 2018 -0700 |
| tree | 8098b643e6d83550355677031ee1ed4ad8e5a025 | |
| parent | d9a8e834dd231333954d857952d918098012c6a0 [diff] | |
| parent | eff814e768f0a65006bb07520983df799ed0cbd9 [diff] |
resolve merge conflicts of eff814e768f0a65006bb07520983df799ed0cbd9 to stage-aosp-master Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I8f602eed512285de840bbadceefb88fdbd652780