OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Sun, 6 Apr 2014 12:49:10 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 6 Apr 2014 12:49:10 +0000 (05:49 -0700)

Trivial merge