OSDN Git Service

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

Trivial merge