OSDN Git Service

am 9c9bd6eb: (-s ours) am 0d8b449e: am dffdfb9e: Merge "ART: Avoid soft- after hard...
authorAndreas Gampe <agampe@google.com>
Thu, 27 Aug 2015 03:47:16 +0000 (03:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 03:47:16 +0000 (03:47 +0000)
* commit '9c9bd6ebc743c33b7f354da44b5115951328f0d0':


Trivial merge