| commit | 504fd0a2e933628c223ec3e3db5a4ddce7ef71ea | [log] [tgz] |
|---|---|---|
| author | Arve Hjønnevåg <arve@android.com> | Thu Aug 18 18:23:22 2016 -0700 |
| committer | Arve Hjønnevåg <arve@android.com> | Thu Aug 18 18:23:22 2016 -0700 |
| tree | 786cf16d8659c801ac1faee183e2b01ab8b441ca | |
| parent | def5b03a2e64628dca657789050a340b33a1796e [diff] | |
| parent | 083f4ecca201e508f0f5cbe0aa95882a82abdf5e [diff] |
resolve merge conflicts of 083f4ec to nyc-dev-plus-aosp Change-Id: I1532b1e4ee225f821fcd6a9eaee11f20bac8c9e1