OSDN Git Service

am f056b356: (-s ours) am 8a4064e2: Fix darwin run-test problems
authorBrian Carlstrom <bdc@google.com>
Tue, 9 Sep 2014 06:16:39 +0000 (06:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Sep 2014 06:16:39 +0000 (06:16 +0000)
* commit 'f056b3569bc61d60399c77814ad38711409d02a3':
  Fix darwin run-test problems


Trivial merge