| commit | b2051afd21af43c4b534bd142f0f962e53aeae4f | [log] [tgz] |
|---|---|---|
| author | Mark De Ruyter <markdr@google.com> | Fri Jun 22 14:54:06 2018 -0700 |
| committer | Mark De Ruyter <markdr@google.com> | Fri Jun 22 21:55:25 2018 +0000 |
| tree | 2267c6a4536638ac8e1a91c8de2510abcba03939 | |
| parent | f5b421426d11c1d08ed2aca1566956e16cdd39a7 [diff] | |
| parent | d9c540a9ede1ee48e6e60c3ace8a923d9c8809e7 [diff] |
resolve merge conflicts of d9c540a9ede1ee48e6e60c3ace8a923d9c8809e7 to stage-aosp-master Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: Ie62589ce86b42a10f88acb4291b623375c1160b5