| commit | a0a9e8996e401c7b4fd4cae34ca99fdb2f4cbe96 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed May 18 21:26:35 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed May 18 21:26:35 2016 -0700 |
| tree | 955f4ee00c2f2ba12ac557b7fecf82a82eab9272 | |
| parent | 2f6a1b3862617ab296681d9039996d6886172180 [diff] | |
| parent | ac83130ac64344d81bdaf54bcf15bfe31c1ba04c [diff] |
resolve merge conflicts of 847d963 to nyc-dev-plus-aosp Change-Id: Ib97f56112bff71e2997116f969fd6d3e30e72f26