| commit | cf0c889566757b0fdbe71081d68ff8cd4a3bd5f1 | [log] [tgz] |
|---|---|---|
| author | Alex Light <allight@google.com> | Wed Jun 29 11:58:22 2016 -0700 |
| committer | Alex Light <allight@google.com> | Wed Jun 29 12:12:39 2016 -0700 |
| tree | de6af404abca8a314afab0023141c785cf72d5fd | |
| parent | 25d4ebdbc5c62cf9064115837b981a5757530305 [diff] | |
| parent | 8d7167fd87834e1d0a5046c0904a7f7185e0fdfb [diff] |
resolve merge conflicts of df9d177 to nyc-mr1-dev-plus-aosp Change-Id: Ib16c68978eac596587de54a811316e6bdb7fed87