OSDN Git Service

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform...
authorPaul Mclean <pmclean@google.com>
Thu, 27 Aug 2015 19:37:15 +0000 (19:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:37:15 +0000 (19:37 +0000)

Trivial merge