| commit | 860f82e6f7a74e1444d8115f87d550f895619a7e | [log] [tgz] |
|---|---|---|
| author | Vitalii Tomkiv <vitalit@google.com> | Fri May 06 13:20:51 2016 -0700 |
| committer | Vitalii Tomkiv <vitalit@google.com> | Fri May 06 13:20:51 2016 -0700 |
| tree | 5afeb83939ec21cf688f5bbe8bf89176e0a803e1 | |
| parent | ae05d346d38b06694c8374007c0aff87c67ff42a [diff] | |
| parent | 106f3c4703d8000d4e3f97e18455ca07e82fd5bb [diff] |
resolve merge conflicts of 106f3c4 to nyc-car-dev Change-Id: I5090f26b42c43315c70f807e8824350e8c9edcbc