OSDN Git Service

am e075053b: (-s ours) am 492123d5: am 119683d1: am 0ffd7158: Merge "Doc change:...
authorDirk Dougherty <ddougherty@google.com>
Thu, 27 Aug 2015 06:44:23 +0000 (06:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 06:44:23 +0000 (06:44 +0000)
* commit 'e075053b0842c21c93a031fbeeecc6fe3882e11d':


Trivial merge