OSDN Git Service

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

Trivial merge