OSDN Git Service

am 7bc74c27: (-s ours) am c0023fec: am 84bfbe14: Merge "Fix broken tests."
authorAart Bik <ajcbik@google.com>
Thu, 27 Aug 2015 04:02:22 +0000 (04:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 04:02:22 +0000 (04:02 +0000)
* commit '7bc74c272502eac52d77b996ccd5fa8a4d9c19af':


Trivial merge