OSDN Git Service

am a048e5f0: (-s ours) am a127607e: am 57a9c7d3: Merge "Fix gtests."
authorCalin Juravle <calin@google.com>
Thu, 27 Aug 2015 04:07:18 +0000 (04:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 04:07:18 +0000 (04:07 +0000)
* commit 'a048e5f0666d809a1d3973b1e939fd2600cd8633':


Trivial merge