| commit | 5e9774c1849a8ec77dc36ac381ce08bbca863817 | [log] [tgz] |
|---|---|---|
| author | Marie Janssen <jamuraa@google.com> | Mon Dec 19 10:31:10 2016 -0800 |
| committer | Marie Janssen <jamuraa@google.com> | Mon Dec 19 10:32:20 2016 -0800 |
| tree | 7b240777593426b14ba4d5e0b86d125c2648a249 | |
| parent | 5c49897d8cbbe2605c3d78ce0ecf84debabb0dad [diff] | |
| parent | ffcf88f36ec8412bc274a51cad3bf03c11c614fb [diff] |
resolve merge conflicts of ffcf88f to nyc-mr2-dev-plus-aosp Change-Id: Ib8c2e6770448bda00c0d64b42ce0495049acb268