OSDN Git Service

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

Trivial merge