OSDN Git Service

am 41a334de: (-s ours) am 376024b4: am f99628f7: Merge "ART: Fix test"
authorAndreas Gampe <agampe@google.com>
Thu, 27 Aug 2015 03:49:23 +0000 (03:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 03:49:23 +0000 (03:49 +0000)
* commit '41a334de6131071158e97714dcc726d2cebfd455':


Trivial merge