OSDN Git Service

am d33e39f1: (-s ours) am db554581: build: Update osi log functions, use consistently
authorMarie Janssen <jamuraa@google.com>
Thu, 27 Aug 2015 10:53:43 +0000 (10:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:53:43 +0000 (10:53 +0000)
* commit 'd33e39f14834ddfcfad27b9bef5ffb87919a8644':


Trivial merge