| commit | fa2bbcc2887a815ff69a8675e0a0e4c6a616b84d | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Jun 16 18:58:04 2016 -0700 |
| committer | Adrian Roos <roosa@google.com> | Thu Jun 16 18:58:04 2016 -0700 |
| tree | 04b2dc6827539c7757eb666eb1234c4c92978cd5 | |
| parent | 10c74d81dfe857c5dd7366ff1b1f29f6e8437b09 [diff] | |
| parent | 380b01a00eeddacce69ee3c8e4bde006d7199af9 [diff] |
resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp Change-Id: If97f5d5b4d67177b8160b96894a35d685573c46a