OSDN Git Service

am d09066dd: (-s ours) am 8d060f27: am c20d7286: Merge "Replaced CHECK with EXPECT...
authorAart Bik <ajcbik@google.com>
Thu, 27 Aug 2015 04:03:56 +0000 (04:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 04:03:56 +0000 (04:03 +0000)
* commit 'd09066dda2bb5a10c2f38cf83f4b1fd473ce3e8f':


Trivial merge