OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 4 Mar 2014 13:50:42 +0000 (05:50 -0800)
committerThe Android Automerger <android-build@google.com>
Tue, 4 Mar 2014 13:50:42 +0000 (05:50 -0800)

Trivial merge