| commit | 20e9085b51c00b7828e3a8fdfe902adc1c89a924 | [log] [tgz] |
|---|---|---|
| author | Matthew Bouyack <mbouyack@google.com> | Thu Oct 06 15:36:56 2016 -0700 |
| committer | Matthew Bouyack <mbouyack@google.com> | Thu Oct 06 15:37:58 2016 -0700 |
| tree | 66ece69b7161dc95e97872d4fa476143f77c79a4 | |
| parent | 6f3e42399459f053cddda4fa2190f0ece3387e06 [diff] | |
| parent | 3b8e6b2f30af0564538c2a660033d6a97ab8038f [diff] |
resolve merge conflicts of 3b8e6b2 to nyc-mr1-dev-plus-aosp Change-Id: I9c02a56d63de5828453aa8926ca801d96b04a6cf