OSDN Git Service

merge in master-release history after reset to 574b641173debed3c0714628dba963e4d276374d
authorThe Android Automerger <android-build@google.com>
Thu, 15 May 2014 12:50:48 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 15 May 2014 12:50:48 +0000 (05:50 -0700)

Trivial merge