OSDN Git Service

am 508c2c95: (-s ours) am 24748416: am a3c31dfd: Merge "ART: Unlink old file in OS...
authorAndreas Gampe <agampe@google.com>
Thu, 27 Aug 2015 03:40:55 +0000 (03:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 03:40:55 +0000 (03:40 +0000)
* commit '508c2c95e77a526ac39187b2690dc3d697958727':


Trivial merge