| commit | 2df9dc0a00bbb37e05ac7add3226066c16780c10 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Nov 29 09:36:52 2016 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Tue Nov 29 09:36:52 2016 +0000 |
| tree | e4a575f9a518fa117a5bfcf24995c0d5ef4b90b3 | |
| parent | 8378b7f6f29e69545ef8c265d9d5ee93d6ffb67d [diff] | |
| parent | 3069899688d42d372d860d06f592aa53678baae2 [diff] |
resolve merge conflicts of 3069899 to nyc-mr2-dev-plus-aosp Change-Id: I4fc296d7e1cf36be40a1aadffd663df4fea5f521