OSDN Git Service

merge in master-release history after reset to a0ceb908bfe6d030f588455db3f3b42c9931fdea
authorThe Android Automerger <android-build@google.com>
Tue, 29 Apr 2014 12:50:57 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 29 Apr 2014 12:50:57 +0000 (05:50 -0700)

Trivial merge