| commit | 5f0dad0e647be543d30904aae38dacc0cf0799f8 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Tue Jan 03 11:35:37 2017 -0800 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Tue Jan 03 11:35:37 2017 -0800 |
| tree | 5d703daaf22cd9223c278e3751d8b234d900ec06 | |
| parent | 29d656dbe1faeab2d2cf5c64790275bcbdbfee06 [diff] | |
| parent | e6b6653da899890f2e44071915d1fa0f851290e9 [diff] |
resolve merge conflicts of e6b6653da899 to nyc-mr2-dev-plus-aosp Change-Id: Ifbbe0d2758ab25aee7001412f71b0445c62cbdac