| commit | 757d17753b7f61a0959afb8200cea022a196b0ca | [log] [tgz] |
|---|---|---|
| author | David Zeuthen <zeuthen@google.com> | Fri Oct 07 16:27:34 2016 -0400 |
| committer | David Zeuthen <zeuthen@google.com> | Fri Oct 07 16:27:34 2016 -0400 |
| tree | 07496198ef2af4ce772e7948b13791d2cba10483 | |
| parent | bd8ab0da8b5a73772414c39add32b3e5706ef421 [diff] | |
| parent | aa126abe229b04e0850f1768592d833813aa17c7 [diff] |
resolve merge conflicts of aa126ab to nyc-mr1-dev-plus-aosp Change-Id: I6e45dff4fcc873a91b6067a04f9fa4e801a1f4c2