OSDN Git Service

am b6f0aefc: (-s ours) am 1c6997b3: am 27b24602: am 47c88fca: Merge "docs: studio...
authorRich Sloager <rslogar@google.com>
Thu, 27 Aug 2015 10:31:30 +0000 (10:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:31:30 +0000 (10:31 +0000)
* commit 'b6f0aefcfd004bbbf2d743180255904df0a85477':


Trivial merge