tree 33aa1eef0e5c8c98990a5ddac97aa792ee629166
parent 54fb2bcc9bdd46e1d22eefb1586e9b620a943492
parent 5b06731e6182fc90b10578a5ea4e61afee78dada
author Joel Fernandes <joelaf@google.com> 1497385602 +0000
committer android-build-merger <android-build-merger@google.com> 1497385602 +0000

Merge "atrace.rc: Correct path to saved_cmdlines_size when setting permission am: 922e418f45 am: 83e73f35d6" into oc-dr1-dev-plus-aosp
am: 5b06731e61

Change-Id: I07d20633206d6e7286dff3debfc9a8ff9d6a62ea