OSDN Git Service

Merge "Track removal of android.system.Os.{sendfile,waitpid}." am: 833aa452a8 am...
authorTobias Thierer <tobiast@google.com>
Fri, 15 Dec 2017 14:14:15 +0000 (14:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Dec 2017 14:14:15 +0000 (14:14 +0000)
commit9dbf242b102d66ea84592c61288ac0f3a04a5c4c
tree5988c4a151a344e34ecee1b9f3d37e7d142ca632
parentd1319bb059fbf6f30cfaf37f236f82933ce61291
parent6cade7fdd586c83aaa272d19ebdf9a3500029a18
Merge "Track removal of android.system.Os.{sendfile,waitpid}." am: 833aa452a8 am: 0712266bd4
am: 6cade7fdd5  -s ours

Change-Id: Id4e5329ee78a816fd3212882ceb927c92da339fe