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)
commit6d9e8f02a373bf4a6c0e72c1a2ef7cdc53a2b8d9
tree13ecc6d882506b61ebbdfbee6981fc123cdd1456
parent10ce8e60e0330bb36308babc9e4741e2b05c6ca4
parent63edeb5f2adba52103fb0fef48a4325ca2153d0f
am 63edeb5f: (-s ours) am 613b4a60: Merge "The windows build now needs to link libole32.dll as well."

* commit '63edeb5f2adba52103fb0fef48a4325ca2153d0f':