OSDN Git Service

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

Trivial merge