OSDN Git Service

am ba4e77de: (-s ours) am c08e0c73: ART: Fix test
authorAndreas Gampe <agampe@google.com>
Thu, 27 Aug 2015 03:50:00 +0000 (03:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 03:50:00 +0000 (03:50 +0000)
* commit 'ba4e77de67278c400f140809585e98bd8969d4bf':


Trivial merge