OSDN Git Service

am 63edeb5f: (-s ours) am 613b4a60: Merge "The windows build now needs to link libole...
authorStephen Hines <srhines@google.com>
Thu, 27 Aug 2015 05:25:25 +0000 (05:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 05:25:25 +0000 (05:25 +0000)
* commit '63edeb5f2adba52103fb0fef48a4325ca2153d0f':


Trivial merge