OSDN Git Service

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform...
authorScott Main <smain@google.com>
Thu, 1 Aug 2013 22:27:46 +0000 (15:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Aug 2013 22:27:46 +0000 (15:27 -0700)

Trivial merge