| commit | 8edd84cdf2f9f64b61467ffdcb9fb6db740684da | [log] [tgz] |
|---|---|---|
| author | Sungsoo <sungsoo@google.com> | Thu Aug 04 09:59:42 2016 +0900 |
| committer | Sungsoo <sungsoo@google.com> | Thu Aug 04 09:59:42 2016 +0900 |
| tree | 65cff6a2409d7be9ffcb11eef4ec6a2271b189ee | |
| parent | e4dc82c092fd4b662bd5c5833923e00b0166679d [diff] | |
| parent | 5cd35666d4600414962eaa4024196de8d743b7d9 [diff] |
resolve merge conflicts of 5cd3566 to nyc-mr1-dev Change-Id: Ic3460d9bd235b6506fa5afeceabeedbf87cc60c7