| commit | 5b7de5976db625a853a0f82d94a6873eed15a174 | [log] [tgz] |
|---|---|---|
| author | Calin Juravle <calin@google.com> | Thu Mar 17 17:22:59 2016 +0000 |
| committer | Calin Juravle <calin@google.com> | Thu Mar 17 17:22:59 2016 +0000 |
| tree | 4d7cd8797e7a1f750dd12e8eedc048f8042597e2 | |
| parent | 484c34688ccd1ad8b288e5c3fdc8a4a767d36b0f [diff] | |
| parent | c19c1c2e1def1f4f5ab5fd9e71b1a6f76d42988f [diff] |
resolve merge conflicts of c19c1c2 to nyc-dev-plus-aosp Change-Id: Iac3339e21d94a5d14316f5df2761ab10cdda28d0