| commit | 5d6ef9767220a4f2cd4a9a62fb79c287725bc0f5 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Thu Jun 23 11:15:01 2016 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Thu Jun 23 11:15:01 2016 +0200 |
| tree | f89397216efcfee690f654daf9b522f029e01b21 | |
| parent | 8cd152faeefb26e74067c67ddf15ec671d01ec2c [diff] | |
| parent | d0274774ab3116a54f79bcfe52aa3cbcf700831b [diff] |
resolve merge conflicts of d027477 to nyc-mr1-dev-plus-aosp Change-Id: I7d0ddf2cf04ed35b3541b99955561203181367fb