| commit | aeacf2928b4de5ccc8d86effd6d6d3da6ad7ff53 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Wed May 04 15:20:59 2016 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Wed May 04 15:20:59 2016 -0700 |
| tree | e310eda14f77f532165dd883ae692fc3b8d2bb5d | |
| parent | 1917b0e98204f52c95136ccb08554d985f135c9b [diff] | |
| parent | 2ac950fb662c31f17f641a7b45c0b72a159a9d80 [diff] |
resolve merge conflicts of 2ac950f to nyc-dev-plus-aosp Change-Id: I41d488ca119260f749180e544e68e66a84015810