| commit | 9d5c93f40758636fea18616cf915d49eca67d7b0 | [log] [tgz] |
|---|---|---|
| author | Doris Liu <tianliu@google.com> | Fri Apr 08 13:31:42 2016 -0700 |
| committer | Doris Liu <tianliu@google.com> | Fri Apr 08 13:31:42 2016 -0700 |
| tree | f0cae7930b3938273c6b8ef2fd209a14fd7b6e10 | |
| parent | 230aa1ce481ae290aea9f3786d2f6909d0db05bc [diff] | |
| parent | 0e89f9804420a9b667eeaadff7916c227e6608cf [diff] |
resolve merge conflicts of 0e89f98 to nyc-dev-plus-aosp Change-Id: Ifa9dea0e4a0337c24dad899a10b5def46679742c