| commit | 129ab63392172c8291439aae76160bf29647a324 | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Mon Oct 23 11:41:58 2017 -0400 |
| committer | Torne (Richard Coles) <torne@google.com> | Mon Oct 23 11:41:58 2017 -0400 |
| tree | 332843aa717bf4e8dc375887051bbdddd6cad692 | |
| parent | 5099d1a3409e37117eb0992521a94d81f19fa22a [diff] | |
| parent | 0c8b471be33433fea1640b9bc47741d75a4957df [diff] |
resolve merge conflicts of 0c8b471be3 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I81ec8e0660100eabdc0664cfc37198e95be95ae2