OSDN Git Service

am 5b0a0b3d: am 70811001: (-s ours) am 208934ff: Merge "fix build by restoring delete...
authorChris Wren <cwren@android.com>
Thu, 27 Aug 2015 16:43:51 +0000 (16:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 16:43:51 +0000 (16:43 +0000)
* commit '5b0a0b3daae5e692a62cfe33607b42a89a9875b7':


Trivial merge