OSDN Git Service

merge in master-release history after reset to 3252d1cd3affeaceef1d69e605708b1cd44a2d5f
authorThe Android Automerger <android-build@google.com>
Wed, 30 Apr 2014 12:51:15 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 30 Apr 2014 12:51:15 +0000 (05:51 -0700)

Trivial merge