| commit | f0f63dd6ec22a85ae8870f917608fbce867ea957 | [log] [tgz] |
|---|---|---|
| author | Dimitry Ivanov <dimitry@google.com> | Wed Feb 24 19:16:58 2016 -0800 |
| committer | Dimitry Ivanov <dimitry@google.com> | Wed Feb 24 19:16:58 2016 -0800 |
| tree | a529d08fa050b4e4155127a7effa143b4a33f447 | |
| parent | fecef63bbe7707ee6660a0053de028d139703a52 [diff] | |
| parent | d8497ee862a097a82fb6d2ce2358bc24bb6d9ea7 [diff] |
resolve merge conflicts of 8c64eeaefe to nyc-dev-plus-aosp Change-Id: I311bcc41f14504b8175986a038eab6f37ab119b8