| commit | c088b23ae5d8cab6878e43cc37b7b5d141f6c6d7 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Mon Apr 03 15:54:29 2017 -0700 |
| committer | Chris Craik <ccraik@google.com> | Mon Apr 03 16:02:14 2017 -0700 |
| tree | df2eac86f23cb2dab056b1972c16a6222e005a89 | |
| parent | b6ff195e4c30012fa6a7b3fe13a7938dc1c007ea [diff] | |
| parent | 9ede47ea07acc34a4fe73d2ef5ba128fe1511483 [diff] |
resolve merge conflicts of 9ede47ea to oc-dev-plus-aosp Test: external/chromium-trace/systrace.py Change-Id: I06f10b563d774ebcd6ebee75eb3622d0d71795c2