OSDN Git Service

am 9877c207: am f376b4cf: (-s ours) am 908c50a1: am f13e914d: am 8cce3984: Merge...
authorEric Gilmore <egilmore@google.com>
Thu, 27 Aug 2015 16:48:57 +0000 (16:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 16:48:57 +0000 (16:48 +0000)
* commit '9877c207b52186ed2424ca810d15bab936d66437':


Trivial merge