| commit | f666e4d385d00a749cbbcfde9d1533e93ab78889 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Fri Jul 29 20:33:33 2016 -0700 |
| committer | Dan Willemsen <dwillemsen@google.com> | Fri Jul 29 20:33:33 2016 -0700 |
| tree | f13ff7bd7c35f032a5ef7746ef09764f117d3149 | |
| parent | fea31ab9b04cebee39fa8c4402bd84dbfd27c8af [diff] | |
| parent | 61ada1228e72fa87d3280e077698eeeaef004e47 [diff] |
resolve merge conflicts of 61ada12 to nyc-mr1-dev-plus-aosp Change-Id: I0a39db916843b7cb034af4390d760d39307e1d14