tree 75b15bc9d9cbedf5503b83459b5088d470515661
parent 7c6061ed4b70a97eccd1c0be444efd3efb7afb92
parent 10c9c24e238782fcb0bcdbb01732bf2acc3efba9
author Steven Moreland <smoreland@google.com> 1481592402 +0000
committer android-build-merger <android-build-merger@google.com> 1481592402 +0000

Merge "Make atrace not depend on /dev/hwbinder." am: 228f4bdaa9
am: 10c9c24e23

Change-Id: I2dccc33d53dab6b6d7c65b03edbd9e7b0691e796