| commit | fb44c2350200ac928d2dd8de5213d64cfdf53b38 | [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 | c1edcbb62914213a7e0f80322f96e41751b127b4 [diff] | |
| parent | 9554822e751a8ef214116e5636159333ccf6af47 [diff] |
resolve merge conflicts of efa8604 to nyc-mr1-dev-plus-aosp Change-Id: Ibacd9b1e0383887f02a009334aaa7b77b986790c