| commit | 6bf40ddf1c484404a70c3217ebfb47ce504d9f93 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Jan 13 21:44:18 2017 -0800 |
| committer | Marco Nelissen <marcone@google.com> | Fri Jan 13 21:44:18 2017 -0800 |
| tree | f4f0f985b11d3b13da69fb56ae7102c564d1d1a9 | |
| parent | 310cc839201233508862e62b0a386156d5203f27 [diff] | |
| parent | 1038297e290c36ffbd1d2935f379bc9e5166a47a [diff] |
resolve merge conflicts of 1038297e29 to nyc-mr1-dev-plus-aosp Change-Id: Iea94c025a346d9b7d02b4968b98256dc87ed493d