| commit | 2722208dd8b7ffaf6e15edea30d4d206a8b56ba2 | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Fri Jul 15 19:46:41 2016 -0700 |
| committer | Daniel Rosenberg <drosen@google.com> | Fri Jul 15 19:46:41 2016 -0700 |
| tree | 2b8ce854927e64e9ead5ee800558185b6e92b12e | |
| parent | 879704463292c57b8de249b3cdc0cdde8c40db5d [diff] | |
| parent | efa8604a1d1b3acd156d6aefdf7840d9e6486dd0 [diff] |
resolve merge conflicts of efa8604 to nyc-mr1-dev-plus-aosp Change-Id: Ibacd9b1e0383887f02a009334aaa7b77b986790c