tree 154f068c12b8e701e45fe20958d88411cf9125b7
parent d9f792c5c40272d7e60397468139937586c3824c
parent 14ee7d4b215ceb28ac7b9c6a4673adea66160fda
author Martijn Coenen <maco@google.com> 1479808849 +0000
committer android-build-merger <android-build-merger@google.com> 1479808849 +0000

Merge "atrace: support HAL services as well." am: 1aea108920 am: 7d7cd0cc88
am: 14ee7d4b21

Change-Id: I17df2efc0a20d6e683f766f107a47c76d53942d8