OSDN Git Service

am 6a49f18d: (-s ours) am 55db89fb: (-s ours) am 57b4d24e: (-s ours) am 09364eeb...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 14:40:40 +0000 (14:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:40:40 +0000 (14:40 +0000)
* commit '6a49f18dafd829d0de18030371af5e7fb47150d4':


Trivial merge