OSDN Git Service

Merge "atrace: don't use sendfile." am: c1c9354ad8
authorJosh Gao <jmgao@google.com>
Wed, 12 Apr 2017 19:54:03 +0000 (19:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 19:54:03 +0000 (19:54 +0000)
commit3ec7db90cc5fffe24c18a92e0fa2275234c38860
tree1f53a1665914788763912b37b6e7b775205a6f0d
parent1bc920ae16e4c7fe45531be5152dd007666768e5
parent86504eb9e6aad1e424c7e9399929b005612c2931
Merge "atrace: don't use sendfile." am: c1c9354ad8
am: 86504eb9e6

Change-Id: I1cdcf014bc7d5b40d1ecd20649d6b2c63777aa7a