| commit | 27de3fc0a14e4adc73f6bb5e68f90a59d0e68110 | [log] [tgz] |
|---|---|---|
| author | Naveen Kalla <mrnaveen@google.com> | Fri Oct 28 15:22:47 2016 -0700 |
| committer | Naveen Kalla <mrnaveen@google.com> | Fri Oct 28 15:24:24 2016 -0700 |
| tree | 1a5ef6484d30f5e9d1236bf678c90e999148094a | |
| parent | 78d93fcd28d4fba5e28fa29eee6d373a5e5c180d [diff] | |
| parent | de591df31fa378fa20dcf9e778072bcdedc0aeb0 [diff] |
resolve merge conflicts of de591df to nyc-mr2-dev-plus-aosp Test: Resolved merge conflict and make sure change compiles Change-Id: I341d3be774687f6cc62f9abb5998ebd6389d07ee