OSDN Git Service

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

Trivial merge