OSDN Git Service

am 81b20406: Merge remote-tracking branch \'goog/master\' into merge
authorChristopher Ferris <cferris@google.com>
Wed, 4 Jun 2014 18:43:40 +0000 (18:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 18:43:40 +0000 (18:43 +0000)
* commit '81b2040683415845efa2694671c3ed212137051d':


Trivial merge